Fix forgotten htmlentities for compatibility with PHP5.4
Merge branch 'bugs_1.x' into develop_1.x