Merge branch 'hotfix/usernamelogin'
Merge branch 'dev'
Move the --no-ff notice to the wiki
Merge branch 'master' into dev