Merged in Tobias's SASL lib