Update google url
Merge branch 'master' into travis-sandbox