[pull] master from php:master#1160

pull[bot] merged 2 commits intowudi:masterwudi/php-src:masterfrom

php:masterphp/php-src:masterCopy head branch name to clipboard