Merge pull request #3204 from ivantcholakov/feature/html-escape-upgrade

Upgrading the function html_escape()