Fix bug in "Login" button.
Merge remote-tracking branch 'origin/dev' into dev