Merge branch '9397-go-manifest' refs #9397
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 10 Feb 2017 16:03:42 +0000 (11:03 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 10 Feb 2017 16:03:42 +0000 (11:03 -0500)

Trivial merge