Merge "Update CodeMirror"