Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Mon, 1 Jun 2015 22:42:57 +0000 (23:42 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 1 Jun 2015 22:42:57 +0000 (23:42 +0100)

Trivial merge