Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 28 Aug 2018 22:26:00 +0000 (23:26 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 28 Aug 2018 22:26:00 +0000 (23:26 +0100)

Trivial merge