Fix highlighting
Fix highlighting
Merge branch 'master' into gh-pages
Rebuild docs