Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 31 Jan 2019 19:39:27 +0000 (19:39 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 31 Jan 2019 19:39:27 +0000 (19:39 +0000)

Trivial merge