for google
;
Merge branch 'hotfix-google-apps' into dev
Merge branch 'release-1.0'