From: Christopher Jones <sixd@php.net>
Date: Wed, 26 Jul 2017 05:23:17 +0000 (+1000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0beta2~38^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=46a6ae0d45648de4cd43f434e44c5cff05359fb4;p=php

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

46a6ae0d45648de4cd43f434e44c5cff05359fb4