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

Merge branch 'PHP-7.1'
---

bf3ce4db940dc96a5ac4bae2f0d5b2a6ef8257ac