Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Mon, 9 Oct 2017 22:41:56 +0000 (23:41 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 9 Oct 2017 22:41:56 +0000 (23:41 +0100)

Trivial merge