Ocaml 4.01.0 stuff
Merge.