Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Sun, 29 Jan 2017 23:51:25 +0000 (23:51 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 29 Jan 2017 23:51:25 +0000 (23:51 +0000)

Trivial merge