Merge branch '11127-delete-trash-with-links'
authorTom Clegg <tom@curoverse.com>
Fri, 17 Feb 2017 22:32:53 +0000 (17:32 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 17 Feb 2017 22:32:53 +0000 (17:32 -0500)
refs #11127


Trivial merge