Force HTML5 (fixing 395c71d2ea74a5adfe5a8ea6e4db91b5c5ea20c6)
Merge branch 'master' into gh-pages