Upgrade for OCaml 4.02