trunk: merge cmt_format
trunk: merge cmt_format

dra27/merlin,rgrinberg/merlin,fxfactorial/merlin,ocaml/merlin,fxfactorial/merlin,dra27/merlin,chambart/merlin,neojski/merlin,dra27/merlin,dra27/merlin,fxfactorial/merlin,the-lambda-church/merlin,haselwarter/merlin,rgrinberg/merlin,ocaml/merlin,the-lambda-church/merlin,chriskonstad/merlin,ocaml/merlin,rgrinberg/merlin,chriskonstad/merlin,neojski/merlin,haselwarter/merlin,chambart/merlin,neojski/merlin,neojski/merlin,haselwarter/merlin,the-lambda-church/merlin,chambart/merlin,fxfactorial/merlin,haselwarter/merlin,rgrinberg/merlin,ocaml/merlin,chambart/merlin