From: Jakub Zelenka <bukka@php.net>
Date: Tue, 14 Mar 2017 18:46:29 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.4RC1~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4f0174e5caded1aecfd5231dd84c02b4c6bbd91;p=php

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

b4f0174e5caded1aecfd5231dd84c02b4c6bbd91