Merging hotfix 'hotfix/2014-12-17-kent-sso' with master.
I think our sessions are doing something naughty.
Merging hotfix 'hotfix/2014-12-17-kent-sso-sessions' with develop.