Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 31 Aug 2017 09:25:31 +0000 (10:25 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 31 Aug 2017 09:25:31 +0000 (10:25 +0100)

Trivial merge