Copy is now opt-in
Merge pull request #187 from Ryman/copy

Copy is now opt-in
Merge upstream