Merge branch '5898-listen-race' refs #5898
authorTom Clegg <tom@curoverse.com>
Thu, 16 Jul 2015 19:20:00 +0000 (15:20 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 16 Jul 2015 19:20:00 +0000 (15:20 -0400)

Trivial merge