Merge branch '9456-less-clear-trash'
authorTom Clegg <tom@curoverse.com>
Thu, 7 Jul 2016 15:43:35 +0000 (11:43 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 7 Jul 2016 15:43:35 +0000 (11:43 -0400)
closes #9456


Trivial merge