Fix an issue with the JS highlighting
Merge branch 'master' into gh-pages