Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Fri, 15 Dec 2017 15:39:42 +0000 (15:39 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 15 Dec 2017 15:39:42 +0000 (15:39 +0000)

Trivial merge