Merge branch '10880-poll-test-races'
authorTom Clegg <tom@curoverse.com>
Fri, 13 Jan 2017 02:52:32 +0000 (21:52 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 13 Jan 2017 02:52:32 +0000 (21:52 -0500)
closes #10880


Trivial merge