Merge branch '2.0' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic into 2.0