More concise cp syntax
Merge branch 'master' into bootstrap