Merge branch 'master' of https://git.php.net/push/php-src
Merge branch 'master' of https://github.com/krakjoe/php-src into unit_test