From: Ferenc Kovacs <tyra3l@gmail.com>
Date: Tue, 2 Jan 2018 23:35:50 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.2RC1~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5275149e3aefbfc958ce6d1a0845865b831e858f;p=php

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

5275149e3aefbfc958ce6d1a0845865b831e858f