Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 6 Nov 2018 00:01:32 +0000 (00:01 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 6 Nov 2018 00:01:32 +0000 (00:01 +0000)

Trivial merge