Fixed the CodeMirror dependencies.
Merge fix.