Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Sat, 13 May 2017 23:50:12 +0000 (00:50 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 13 May 2017 23:50:12 +0000 (00:50 +0100)

Trivial merge