Merge branch 'v2.12.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.12.x
authorCarl Hetherington <cth@carlh.net>
Mon, 21 Jan 2019 17:06:06 +0000 (17:06 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 21 Jan 2019 17:06:06 +0000 (17:06 +0000)

Trivial merge