Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
authorCarl Hetherington <cth@carlh.net>
Tue, 23 Jul 2019 20:31:33 +0000 (21:31 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 23 Jul 2019 20:31:33 +0000 (21:31 +0100)

Trivial merge