HTML syntax update
Merge branch 'master' into solarized-light