Hopefully fixed everything login/logout related...
Merge remote-tracking branch 'origin/master'