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

Trivial merge