HTML5 validation passed
Merge branch 'master' into gh-pages