Merge branch 'master' of git.php.net:/php-src
authorXinchen Hui <laruence@gmail.com>
Wed, 9 Sep 2015 10:02:27 +0000 (18:02 +0800)
committerXinchen Hui <laruence@gmail.com>
Wed, 9 Sep 2015 10:02:27 +0000 (18:02 +0800)

Trivial merge