Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Sat, 17 Jun 2017 23:49:33 +0000 (00:49 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 17 Jun 2017 23:49:33 +0000 (00:49 +0100)

Trivial merge