Merge branch 'html_entities_iso'