Update for lattest ocp-build
Merge branch 'typerex2' of github.com:OCamlPro/typerex into typerex2