Fix charset
Merge branch 'master' into 1.10
PHP 5.3 required