From: Andrea Faulds <ajf@ajf.me>
Date: Sat, 29 Apr 2017 15:12:55 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha2~15^2~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a398e3e72d735a0c5d51e3acf5622d7d67a75776;p=php

Merge branch 'PHP-7.1'
---

a398e3e72d735a0c5d51e3acf5622d7d67a75776