Merge branch '9397-go-manifest' into origin-9397-prepopulate-output-directory
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 9 Feb 2017 19:11:53 +0000 (14:11 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 9 Feb 2017 19:11:53 +0000 (14:11 -0500)

Trivial merge