Merge latest CodeMirror v4