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

Merge branch 'PHP-7.4'

* PHP-7.4:
  Catch up with some recent changes [ci skip]
---

0b81ebdf2a76909338432fdb0f9adf69a8862cd4