Authenication messages should avoid the word "username" unless LDAP is enabled
Merge branch 'master' of https://github.com/corydoras/base