Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
authorCarl Hetherington <cth@carlh.net>
Thu, 3 Oct 2019 23:22:36 +0000 (01:22 +0200)
committerCarl Hetherington <cth@carlh.net>
Thu, 3 Oct 2019 23:22:36 +0000 (01:22 +0200)

Trivial merge