From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 5 Nov 2020 15:37:45 +0000 (+0100)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d894916c532f3d7a17cdb5283cbdc9f85333801;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Backport preloading trait fixup fixes
---

2d894916c532f3d7a17cdb5283cbdc9f85333801