merge latest CodeMirror changes