Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 5 Jan 2018 18:57:56 +0000 (18:57 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 5 Jan 2018 18:57:56 +0000 (18:57 +0000)

Trivial merge