Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Tue, 14 Feb 2017 17:02:57 +0000 (17:02 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 14 Feb 2017 17:02:57 +0000 (17:02 +0000)

Trivial merge