Merge branch '9986-fuse-test-deadlock' closes #9986
authorTom Clegg <tom@curoverse.com>
Wed, 14 Sep 2016 16:04:00 +0000 (12:04 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 14 Sep 2016 16:04:00 +0000 (12:04 -0400)

Trivial merge