Backport refactoring from php-src
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6