Merge branch '7121-fix-deadlock' closes #7121
authorTom Clegg <tom@curoverse.com>
Wed, 9 Sep 2015 02:40:22 +0000 (22:40 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 9 Sep 2015 02:40:22 +0000 (22:40 -0400)

Trivial merge