Merge branch PHP-5.6 of php-src