From: Jakub Zelenka <bukka@php.net>
Date: Fri, 13 Apr 2018 19:12:03 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.6RC1~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4302c0b542b540776cf9f82ca713ded282bb4d70;p=php

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

4302c0b542b540776cf9f82ca713ded282bb4d70