Merge branch '6235-go-sdk-discovery' closes #6235
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 9 Jun 2015 15:22:52 +0000 (11:22 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 9 Jun 2015 15:22:52 +0000 (11:22 -0400)

Trivial merge