Unbroke login.php
Merge remote-tracking branch 'origin/master' into annes_branch