Merge branch '8555-s3-trash'
authorTom Clegg <tom@curoverse.com>
Wed, 27 Jul 2016 19:22:26 +0000 (15:22 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 27 Jul 2016 19:22:26 +0000 (15:22 -0400)
closes #8555


Trivial merge