Sync with gildor478/ocaml.