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

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

a1e74a9e0e531118c7cd2f35438a798c4c2fd8ee