Merge branch '7393-s3-volume' closes #7393
authorTom Clegg <tom@curoverse.com>
Thu, 10 Dec 2015 21:12:20 +0000 (16:12 -0500)
committerTom Clegg <tom@curoverse.com>
Thu, 10 Dec 2015 21:12:20 +0000 (16:12 -0500)

Trivial merge