Merge branch '2760_passwords_in_history'