clipboard: demandimport fixes
Merge branch 'master' of github.com:/bwesterb/pol