Merge branch 'v2.12.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.12.x
authorCarl Hetherington <cth@carlh.net>
Tue, 25 Sep 2018 21:07:03 +0000 (22:07 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 25 Sep 2018 21:07:03 +0000 (22:07 +0100)

Trivial merge