Merge pull request #2953 from wsoltys/paste_clipboard