Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0