From: Ferenc Kovacs <tyra3l@gmail.com>
Date: Tue, 24 Apr 2018 22:14:33 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.18RC1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=127273327b6ec99db25815b28c2b4c6879faa084;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

127273327b6ec99db25815b28c2b4c6879faa084