Merge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x
authorCarl Hetherington <cth@carlh.net>
Mon, 14 Oct 2019 09:24:48 +0000 (11:24 +0200)
committerCarl Hetherington <cth@carlh.net>
Mon, 14 Oct 2019 09:24:48 +0000 (11:24 +0200)

Trivial merge