Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 30 Jan 2018 13:08:39 +0000 (13:08 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 30 Jan 2018 13:08:39 +0000 (13:08 +0000)

Trivial merge