check if the security token is available before checking if the user is logged in
Merge branch 'refs/heads/master' into 2.1