Merge branch '10467-client-disconnect' closes #10467
authorTom Clegg <tom@curoverse.com>
Fri, 30 Dec 2016 22:06:55 +0000 (17:06 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 30 Dec 2016 22:06:55 +0000 (17:06 -0500)

Trivial merge