Merge branch 'master' of ssh://git.carlh.net/home/carl/git/libdcp
authorCarl Hetherington <cth@carlh.net>
Thu, 16 Aug 2018 22:33:22 +0000 (23:33 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 16 Aug 2018 22:33:22 +0000 (23:33 +0100)

Trivial merge