From: Andrea Faulds <ajf@ajf.me>
Date: Fri, 29 Sep 2017 20:38:30 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0RC4~36^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43722931920a5802befb2b012d92431e26aa6058;p=php

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

43722931920a5802befb2b012d92431e26aa6058