Sso In Features

Merged Sid Sijbrandij requested to merge sso-in-features into master