Implement the delete proxy trap (fixes #2213).
Merge pull request #2947 from Ms2ger/delete-trap

Implement the delete proxy trap (fixes #2213); r=jdm