Merge pull request #2046 from PeterCrozier/trap