Merge branch 'master' into 7252-go-sdk-errors
authorradhika <radhika@curoverse.com>
Fri, 27 Nov 2015 16:02:38 +0000 (11:02 -0500)
committerradhika <radhika@curoverse.com>
Fri, 27 Nov 2015 16:02:38 +0000 (11:02 -0500)

Trivial merge