Upstream locale is fixed, we now have better language support
Merge pull request #755 from stuartf/issue-755

Locale-related unit test failure
Fix compatibility with passport 0.2.0
Merge pull request #756 from mrvisser/passport-broken-build

Fix compatibility with passport 0.2.0
Google authentication: limit to a domain

Adds a config value which allows a tenant admin to specify the domain
to which the authentication should be limited.

If this value is specified, the user will not be presented with the
account choser and be taking straight to the login view for that domain.
Purist change: Changed 'ex:' to 'e.g.,'
Removed trailing comma