Ignoring HTML comments
Fixing failed unit tests
merge from upstream master