trunk: merge untypeast
trunk: merge untypeast

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