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