Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
authorCarl Hetherington <cth@carlh.net>
Mon, 3 Aug 2020 07:16:27 +0000 (09:16 +0200)
committerCarl Hetherington <cth@carlh.net>
Mon, 3 Aug 2020 07:16:27 +0000 (09:16 +0200)

Trivial merge