Merge with Tobias's SASL redesign branch