Merge branch 'master' of ssh://git.carlh.net/home/carl/git/libdcp
authorCarl Hetherington <cth@carlh.net>
Sun, 23 Sep 2018 23:45:27 +0000 (00:45 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 23 Sep 2018 23:45:27 +0000 (00:45 +0100)

Trivial merge