Merge commit '24b7dc20afabea6ebf0b1f7e80ff2aaaabe0e8bd' * commit '24b7dc20afabea6ebf0b1f7e80ff2aaaabe0e8bd': make the password-clearing algorithm smarter
Merge commit '24b7dc20afabea6ebf0b1f7e80ff2aaaabe0e8bd' * commit '24b7dc20afabea6ebf0b1f7e80ff2aaaabe0e8bd': make the password-clearing algorithm smarter