Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 3 May 2019 22:10:29 +0000 (22:10 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 3 May 2019 22:10:29 +0000 (22:10 +0000)

Trivial merge