10797: Merge branch 'master' into 10797-ruby-2.3
authorTom Clegg <tom@curoverse.com>
Wed, 15 Feb 2017 22:40:40 +0000 (17:40 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 15 Feb 2017 22:40:40 +0000 (17:40 -0500)

Trivial merge