Fix bug #67922
Merge branch 'master' of git://github.com/php/php-src