Don't override P paste binding
Merge branch 'master' into edge