Merge branch '10538-trash-delete' closes #10538
authorTom Clegg <tom@curoverse.com>
Fri, 30 Dec 2016 20:17:02 +0000 (15:17 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 30 Dec 2016 20:17:02 +0000 (15:17 -0500)

Trivial merge