From: Jakub Zelenka <bukka@php.net>
Date: Fri, 30 Mar 2018 16:58:29 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.5RC1~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b642af484fba85c4e1a1a0a71d7f0c998740002;p=php

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

8b642af484fba85c4e1a1a0a71d7f0c998740002