10467: Merge branch 'master' into 10467-client-disconnect
authorTom Clegg <tom@curoverse.com>
Wed, 21 Dec 2016 15:08:44 +0000 (10:08 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 21 Dec 2016 15:08:44 +0000 (10:08 -0500)

Trivial merge