Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Mon, 19 Sep 2016 23:21:54 +0000 (00:21 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 19 Sep 2016 23:21:54 +0000 (00:21 +0100)

Trivial merge