Merge pull request #3029 from jhsrennie/keyedpaste