From: Andrea Faulds <ajf@ajf.me>
Date: Sat, 12 Aug 2017 00:38:21 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0beta3~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f877b86604e9c7e8642e1a6dd44954cb1f21ea34;p=php

Merge branch 'PHP-7.1' into PHP-7.2
---

f877b86604e9c7e8642e1a6dd44954cb1f21ea34