Merge branch '8178-trash-interface-generic-volume-test' closes #8178
authorTom Clegg <tom@curoverse.com>
Mon, 15 Feb 2016 15:49:39 +0000 (10:49 -0500)
committerTom Clegg <tom@curoverse.com>
Mon, 15 Feb 2016 15:49:39 +0000 (10:49 -0500)

Trivial merge