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