Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Mon, 23 Jan 2017 19:24:31 +0000 (19:24 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 23 Jan 2017 19:24:31 +0000 (19:24 +0000)

Trivial merge