Update Changes for #1394
Update Changes for #1394
rgrinberg/merlin,ocaml/merlin,dra27/merlin,rgrinberg/merlin,ocaml/merlin,dra27/merlin,dra27/merlin,ocaml/merlin,dra27/merlin,ocaml/merlin,rgrinberg/merlin,rgrinberg/merlin