Allow username logins
Finish AllowUsernameLogins
Merged 'master'.