Redirect properly on logout/login
Merge remote-tracking branch 'origin/master'