Merge with sasl branch.