Try to upgrade OCaml branch with the last changes of OxCaml one#4

lyrm merged 3 commits intotarides:maintarides/merlin_mockup:mainfrom

Tim-ats-d:fix-ocaml-branchTim-ats-d/merlin_mockup:fix-ocaml-branchCopy head branch name to clipboard