HTML cleanup
Merge pull request #1905 from dunglas/patch-2

HTML cleanup