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

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

d1f43b1a586f2fc36cdfdad99489c215e373b8e5