Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 23 Mar 2017 09:36:44 +0000 (09:36 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 23 Mar 2017 09:36:44 +0000 (09:36 +0000)

Trivial merge