Merge pull request #272 from vmg/fix-escaped-comments

Avoid escaping on HTML comments
Merge branch 'master' into drop-1-8