New upstream CodeMirror version; improved CodeMirror integration