Merge branch 'master' of https://github.com/simonz130/google-cloud-go