Merge branch 'remove-html-comments'