Merge branch 'dist' of ssh://git.carlh.net/home/carl/git/dcpomatic into dist