From: Johannes Schlüter <johannes@php.net>
Date: Fri, 14 Apr 2017 14:30:51 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.5RC1~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b760508adc0f6046ee5d8e529578e96889fb712e;p=php

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

b760508adc0f6046ee5d8e529578e96889fb712e