Cherry-pick 15062,15063,15064 from 4.02 (#6497).

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