Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 11 Jul 2017 13:47:45 +0000 (14:47 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 11 Jul 2017 13:47:45 +0000 (14:47 +0100)

Trivial merge