5824: Merge branch 'master' into 5824-go-sdk
authorTom Clegg <tom@curoverse.com>
Wed, 12 Aug 2015 17:45:43 +0000 (13:45 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 12 Aug 2015 17:45:43 +0000 (13:45 -0400)

Trivial merge