Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Wed, 3 May 2017 18:39:35 +0000 (19:39 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 3 May 2017 18:39:35 +0000 (19:39 +0100)

Trivial merge