Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 1 Feb 2018 13:25:59 +0000 (13:25 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 1 Feb 2018 13:25:59 +0000 (13:25 +0000)

Trivial merge