Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 2 May 2017 21:41:52 +0000 (22:41 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 2 May 2017 21:41:52 +0000 (22:41 +0100)

Trivial merge