From: Nikita Popov <nikic@php.net>
Date: Sat, 7 Jan 2017 22:56:00 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~594
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49c48e3f3ad0bda76c1cca52fa66b5a81c19cc03;p=php

Merge branch 'PHP-7.1'
---

49c48e3f3ad0bda76c1cca52fa66b5a81c19cc03