Better messages for login server errors
Merge remote-tracking branch 'upstream/master'