From: Xinchen Hui <laruence@gmail.com>
Date: Tue, 14 Jun 2016 00:36:26 +0000 (-0700)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-7.1.0alpha3~42^2~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=564cc38245215d0ab50642c46742423f70dc0100;p=php

Merge branch 'master' of git.php.net:/php-src
---

564cc38245215d0ab50642c46742423f70dc0100