From: Ferenc Kovacs <tyra3l@gmail.com>
Date: Wed, 28 Mar 2018 21:21:04 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.5RC1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87a9fc3b856d17548c4aa0bacef9386c454b2269;p=php

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

87a9fc3b856d17548c4aa0bacef9386c454b2269