Changes for displaying easily at w3c.github.io
Merge branch 'master' into gh-pages