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

Trivial merge