From: Anatol Belski <ab@php.net>
Date: Mon, 27 Mar 2017 17:42:24 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.4RC1~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6508320936ab5e9694b7d282a57462179a0fb1bc;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  deps updated, cherry-pick 88642decf9ab59d206db515990886b0761bfa835
  add test for bug #74230
---

6508320936ab5e9694b7d282a57462179a0fb1bc