Merge branch 'master' of git.php.net:php-src
authorXinchen Hui <laruence@php.net>
Mon, 10 Aug 2015 09:03:36 +0000 (17:03 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 10 Aug 2015 09:03:36 +0000 (17:03 +0800)

Trivial merge