5.5.9-dev now
fix encoding
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'