Fix forgotten htmlentities for compatibility with PHP5.4 

- Update branch bugs_1.x with branch develop_1.x
- Fix forgotten htmlentities for compatibility with PHP5.4