Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0