Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 28 Feb 2019 09:11:42 +0000 (09:11 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 28 Feb 2019 09:11:42 +0000 (09:11 +0000)

Trivial merge