Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Tue, 15 Nov 2016 19:40:37 +0000 (19:40 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 15 Nov 2016 19:40:37 +0000 (19:40 +0000)

Trivial merge