merge changes from branch 4.02 from branching (rev 14852) to 4.02.0+rc1 (rev 15121)

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