Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Wed, 7 Mar 2018 21:42:36 +0000 (21:42 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 7 Mar 2018 21:42:36 +0000 (21:42 +0000)

Trivial merge