Merge branch 'v2.12.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.12.x
authorCarl Hetherington <cth@carlh.net>
Fri, 16 Feb 2018 23:53:09 +0000 (23:53 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 16 Feb 2018 23:53:09 +0000 (23:53 +0000)

Trivial merge