Merge branch 'sasl_fixes'