Merge bug fix for "password length test" into branch.