Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Wed, 9 Nov 2016 16:02:01 +0000 (16:02 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 9 Nov 2016 16:02:01 +0000 (16:02 +0000)

Trivial merge