Fix bug with scrambled paste on OSX
Merge commit 'HEAD@{1}'

Conflicts:
	ftplugin/python/pyutils.vim