fix:html entity escape
Merge remote-tracking branch 'origin/master'