Pre merge changes
Merge branch 'master' of github.com:acbecker/SSO13