Merge v3.x
authorMichael Wallner <mike@php.net>
Thu, 9 Jun 2022 09:11:47 +0000 (11:11 +0200)
committerMichael Wallner <mike@php.net>
Thu, 9 Jun 2022 09:11:47 +0000 (11:11 +0200)

Trivial merge