Fix PR#5989 and PR#5993 (from trunk)

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