Merge pull request #596 from eric-wu/release-7

Rewire delete to go to trash can