Merging hotfix 'hotfix/2014-12-17-kent-sso' with master.
Allowing both GET and POST requests.
Merging hotfix 'hotfix/2014-12-17-kent-sso' with develop.