Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
authorCarl Hetherington <cth@carlh.net>
Tue, 3 Dec 2019 10:21:43 +0000 (11:21 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 3 Dec 2019 10:21:43 +0000 (11:21 +0100)

Trivial merge