Upstream::Codemirror from 3.15 to 3.16