From: Andrea Faulds <ajf@ajf.me>
Date: Mon, 5 Sep 2016 21:13:42 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~1330
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=642526cc4eeec46bf9c35a3fb72f4810282bbf5c;p=php

Merge branch 'PHP-7.1'
---

642526cc4eeec46bf9c35a3fb72f4810282bbf5c