Merge "Update notes about password security"