Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Wed, 25 Apr 2018 21:51:37 +0000 (22:51 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 25 Apr 2018 21:51:37 +0000 (22:51 +0100)

Trivial merge