From: Nikita Popov <nikic@php.net>
Date: Mon, 9 Jan 2017 22:21:17 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~568
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=998b1a14af2d156eb1db375e621fd82ae33cb236;p=php

Merge branch 'PHP-7.1'
---

998b1a14af2d156eb1db375e621fd82ae33cb236