merge with php-src