Merge branch '8288-arv-mount-deadlock' refs #8288
authorTom Clegg <tom@curoverse.com>
Wed, 3 Feb 2016 17:51:54 +0000 (12:51 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 3 Feb 2016 17:51:54 +0000 (12:51 -0500)

Trivial merge