Merge pull request #2210 from ystr/FromHtml-xxx