Returning to main repo marijnh/CodeMirror#2677 . Thanks folks!