From: Nikita Popov <nikic@php.net>
Date: Tue, 10 Jan 2017 22:29:50 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~557^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b916b15a5c011ad1cd19b0831e6e2d3c246f6ff;p=php

Merge branch 'PHP-7.1'
---

9b916b15a5c011ad1cd19b0831e6e2d3c246f6ff