Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Wed, 21 Dec 2016 16:15:49 +0000 (16:15 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 21 Dec 2016 16:15:49 +0000 (16:15 +0000)

Trivial merge