Merge branch 'no-cleartext-passwords-in-db'