Updated to php-src/master