Fix G+ error
Merge branch 'fix-google-plus-auth'