From: Jakub Zelenka <bukka@php.net>
Date: Thu, 27 Apr 2017 14:45:31 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.6RC1~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c436fe24265573431f97a3dfde8dd4617225ac90;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

c436fe24265573431f97a3dfde8dd4617225ac90