Merge branch '10484-count-clients' closes #10484
authorTom Clegg <tom@curoverse.com>
Wed, 23 Nov 2016 19:36:59 +0000 (14:36 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 23 Nov 2016 19:36:59 +0000 (14:36 -0500)

Trivial merge