Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Sat, 9 Feb 2019 00:30:53 +0000 (00:30 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 9 Feb 2019 00:30:53 +0000 (00:30 +0000)

Trivial merge