Merge branch '8288-poll-client-close-timeout' refs #8288
authorTom Clegg <tom@curoverse.com>
Thu, 4 Feb 2016 18:17:31 +0000 (13:17 -0500)
committerTom Clegg <tom@curoverse.com>
Thu, 4 Feb 2016 18:17:31 +0000 (13:17 -0500)

Trivial merge