From: Nikita Popov <nikic@php.net>
Date: Sun, 1 Jan 2017 11:17:01 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~698
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1283ea466597bebba2ee887304c4df82fd331e35;p=php

Merge branch 'PHP-7.1'
---

1283ea466597bebba2ee887304c4df82fd331e35