Fix bugs related to a user not being logged in, or being logged in, when accessing specific pages
Merge remote-tracking branch 'origin/master'