Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Wed, 15 Aug 2018 18:56:34 +0000 (19:56 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 15 Aug 2018 18:56:34 +0000 (19:56 +0100)

Trivial merge