From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 14 Jun 2019 10:29:40 +0000 (+0300)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0alpha2~97
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e397e9887240462a4a0fa28a516cedf8604b8f6;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Backport 96a12578c13b5c37195b10526fcdc669b795644d
---

6e397e9887240462a4a0fa28a516cedf8604b8f6