Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Sun, 19 Jun 2016 20:10:06 +0000 (21:10 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 19 Jun 2016 20:10:06 +0000 (21:10 +0100)

Trivial merge