Forgot about that typo
Merge branch 'master' into devise-omniauth-saml