Fix test
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Merge branch 'PHP-5.5' of https://github.com/php/php-src into PHP-5.5