From: Nikita Popov <nikic@php.net>
Date: Tue, 27 Sep 2016 17:49:01 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~1232^2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2083007813e20c4be1d9e4e30e5fd47018f24142;p=php

Merge branch 'PHP-7.1'
---

2083007813e20c4be1d9e4e30e5fd47018f24142