Edited copy
Merge branch 'copyedit2' into dev1