Support CDATA blocks in HTML/XML
Merge branch 'master' into upstream
tweak HTML CDATA token kinds
Merge branch 'master' into upstream