Merge branch '10467-client-disconnect' refs #10467
authorTom Clegg <tom@curoverse.com>
Tue, 8 Nov 2016 22:07:47 +0000 (17:07 -0500)
committerTom Clegg <tom@curoverse.com>
Tue, 8 Nov 2016 22:07:47 +0000 (17:07 -0500)

Trivial merge