Merge remote-tracking branch 'upstream/master' into add-acl
Merge branch 'add-acl' of github.com:gmlewis/gcloud-golang into add-acl