Merge branch 'dist' of ssh://git.carlh.net/home/carl/git/dcpomatic into dist
authorCarl Hetherington <cth@carlh.net>
Sun, 5 Apr 2020 19:41:23 +0000 (21:41 +0200)
committerCarl Hetherington <cth@carlh.net>
Sun, 5 Apr 2020 19:41:23 +0000 (21:41 +0200)

Trivial merge