From: Nikita Popov <nikic@php.net>
Date: Wed, 28 Sep 2016 17:23:09 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~1232^2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d04b5c2881095b11296fdef37878d60c0704426;p=php

Merge branch 'PHP-7.1'
---

3d04b5c2881095b11296fdef37878d60c0704426