Google is now available
Merge branch 'development' into oauth2