Ident: apply 4.12 patch
Ident: apply 4.12 patch

ocaml/merlin,dra27/merlin,dra27/merlin,the-lambda-church/merlin,ocaml/merlin,the-lambda-church/merlin,the-lambda-church/merlin,dra27/merlin,dra27/merlin,rgrinberg/merlin,rgrinberg/merlin,ocaml/merlin,rgrinberg/merlin,ocaml/merlin,rgrinberg/merlin