Merge branch 'master' of git.php.net:/php-src
authorXinchen Hui <laruence@gmail.com>
Sun, 15 Nov 2015 02:42:23 +0000 (18:42 -0800)
committerXinchen Hui <laruence@gmail.com>
Sun, 15 Nov 2015 02:42:23 +0000 (18:42 -0800)

Trivial merge