From: Christopher Jones <sixd@php.net>
Date: Tue, 20 Jun 2017 06:00:55 +0000 (+1000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.7RC1~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ecddd2c2437c25a45304c9e38400ede420db72d;p=php

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

7ecddd2c2437c25a45304c9e38400ede420db72d