Merge branch '10224-efficient-event-poll-startup' refs #10224
authorTom Clegg <tom@curoverse.com>
Thu, 3 Nov 2016 19:45:13 +0000 (15:45 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 3 Nov 2016 19:45:13 +0000 (15:45 -0400)

Trivial merge