Use tags for PasteWrap
Merge pull request #2947 from daguej/master

Use tags for PasteWrap