Merge pull request #1894 from solgenomics/topic/encode_passwords