Bugfix: typo.
Bugfix: google assertion oauth was not quite working.
Merge branch 'master' into i18n