[gh-275] Merging from testing into staging -c 1369

sites/all/libraries/codemirror/mode/diff/index.html

sites/all/libraries/codemirror/mode/gfm/gfm.js

sites/all/libraries/codemirror/mode/gfm/index.html

sites/all/libraries/codemirror/mode/groovy/groovy.js

sites/all/libraries/codemirror/mode/groovy/index.html

sites/all/libraries/codemirror/mode/haskell/haskell.js

sites/all/libraries/codemirror/mode/haskell/index.html

sites/all/libraries/codemirror/mode/htmlmixed/htmlmixed.js

sites/all/libraries/codemirror/mode/htmlmixed/index.html

sites/all/libraries/codemirror/mode/javascript/index.html

sites/all/libraries/codemirror/mode/javascript/javascript.js

sites/all/libraries/codemirror/mode/jinja2/index.html

sites/all/libraries/codemirror/mode/jinja2/jinja2.js

sites/all/libraries/codemirror/mode/lua/index.html

sites/all/libraries/codemirror/mode/lua/lua.js

sites/all/libraries/codemirror/mode/markdown/index.html

sites/all/libraries/codemirror/mode/markdown/markdown.css

sites/all/libraries/codemirror/mode/markdown/markdown.js

sites/all/libraries/codemirror/mode/ntriples/index.html

sites/all/libraries/codemirror/mode/ntriples/ntriples.js