Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 12 Feb 2019 21:39:01 +0000 (21:39 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 12 Feb 2019 21:39:01 +0000 (21:39 +0000)

Trivial merge