Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Sat, 5 Oct 2019 19:27:58 +0000 (21:27 +0200)
committerCarl Hetherington <cth@carlh.net>
Sat, 5 Oct 2019 19:27:58 +0000 (21:27 +0200)

Trivial merge