Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 27 Feb 2018 15:34:50 +0000 (15:34 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 27 Feb 2018 15:34:50 +0000 (15:34 +0000)

Trivial merge