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)
commitebb2559b3a09636ff687316bbe512e0e8a86b168
treed0396c2d93ae087f394e0fd64857341499fb86dc
parentd0dc273718a2f657643a2b2800d984c7a3a62f78
parentc1a8e01539932e2f0153cfb2ffc4eaa2c3dc00f1
10467: Merge branch 'master' into 10467-client-disconnect