Merge ocaml (4.05.0-10) import into refs/heads/workingbranch
authorXimin Luo <infinity0@debian.org>
Wed, 4 Oct 2017 12:14:39 +0000 (13:14 +0100)
committerXimin Luo <infinity0@debian.org>
Wed, 4 Oct 2017 12:14:39 +0000 (13:14 +0100)

Trivial merge