From: Tianfang Yang <tianfyan@php.net>
Date: Mon, 14 Aug 2017 04:23:41 +0000 (-0400)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0beta3~16^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d936c1254cdb8db9a6203cec301839fc335d324;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

4d936c1254cdb8db9a6203cec301839fc335d324