From: Peter Kokot <peterkokot@gmail.com>
Date: Thu, 6 Jun 2019 23:25:20 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7afd7b375abd3ee1be4f96dd2cf9a10b8c384d3;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  [ci skip] Catch up with 642b8d00e01170eb934c1adb56bcf43c9c4aecd4
---

b7afd7b375abd3ee1be4f96dd2cf9a10b8c384d3