Merge copytool branch

It is a large branch - getting it onto master probably deserves a milestone.

Unstarted Issues (open and unassigned)

Ongoing Issues (open and assigned)

Completed Issues (closed)