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

Trivial merge