Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
authorCarl Hetherington <cth@carlh.net>
Fri, 24 Apr 2020 14:18:37 +0000 (16:18 +0200)
committerCarl Hetherington <cth@carlh.net>
Fri, 24 Apr 2020 14:18:37 +0000 (16:18 +0200)

Trivial merge