Change HTML attributes for CSS rules
Merge branch 'master' into gh-pages