Tried to fix google assertion auth, other bugs.
Merge branch 'master' into i18n