Don't use fancy `cp` flags
Merge branch 'master' into latin1-xf86