From: Nikita Popov <nikita.ppv@gmail.com>
Date: Sun, 9 Apr 2017 13:57:26 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b2c6821cdfa9c0d7e6977e4db7a4a0504720613;p=php

Merge branch 'PHP-7.1'

[skip ci]
---

2b2c6821cdfa9c0d7e6977e4db7a4a0504720613