Merge branch 'help_escape_html' into tvierling