Merge branch 'PHP-5.4' into PHP-5.5