Merge branch '10467-client-disconnect' refs #10467
authorTom Clegg <tom@curoverse.com>
Wed, 21 Dec 2016 15:38:51 +0000 (10:38 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 21 Dec 2016 15:38:51 +0000 (10:38 -0500)

Trivial merge