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

Trivial merge