Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Sat, 27 Aug 2016 19:28:18 +0000 (20:28 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 27 Aug 2016 19:28:18 +0000 (20:28 +0100)

Trivial merge