Merge branch '11237-google-api-python-client' refs #11237
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 7 Apr 2017 19:26:54 +0000 (15:26 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 7 Apr 2017 19:26:54 +0000 (15:26 -0400)

Trivial merge