bug fix: login should now work
Merge remote-tracking branch 'upstream/master'