Tweaking to allow already being logged in
Merge branch 'master' into openshift