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)
commit7ba6bdf406546ec225baea49dbe6ccbf02e70f53
tree77923c9508769159dfdb8624e299c6451044b0a0
parentbe87361dedf4e35405616e802fba12dedf86dfde
parentd65114fdee11cfd20833a96c34ebf5346baeb755
Merge branch '8555-s3-trash'

closes #8555