Merge "Fix parsing of <pre> tags generated by extension tag hooks"