Merge branch '10467-client-disconnect' refs #10467
authorTom Clegg <tom@curoverse.com>
Thu, 8 Dec 2016 16:43:42 +0000 (11:43 -0500)
committerTom Clegg <tom@curoverse.com>
Thu, 8 Dec 2016 16:43:42 +0000 (11:43 -0500)

Trivial merge