Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Mon, 24 Jul 2017 10:38:28 +0000 (11:38 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 24 Jul 2017 10:38:28 +0000 (11:38 +0100)

Trivial merge