Cherry-pick 15314 from trunk (see #5904, #6582).

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15411 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02