Merge branch '4875-keepclient-test-race' closes #4875
authorTom Clegg <tom@curoverse.com>
Mon, 29 Dec 2014 21:59:35 +0000 (16:59 -0500)
committerTom Clegg <tom@curoverse.com>
Mon, 29 Dec 2014 21:59:35 +0000 (16:59 -0500)

Trivial merge