Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 23 May 2017 09:03:30 +0000 (10:03 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 23 May 2017 09:03:30 +0000 (10:03 +0100)

Trivial merge