Merge pull request #672 from SamWhited/development

Don't escape passwords in SASL