From: Nikita Popov <nikic@php.net>
Date: Sat, 24 Sep 2016 11:23:54 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~1232^2~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96305b456b88361e1fe2be48be11add420f93769;p=php

Merge branch 'PHP-7.1'
---

96305b456b88361e1fe2be48be11add420f93769