Merge remote-tracking branch 'origin/v3.x'
authorMichael Wallner <mike@php.net>
Wed, 8 Jun 2022 17:50:32 +0000 (19:50 +0200)
committerMichael Wallner <mike@php.net>
Wed, 8 Jun 2022 17:50:32 +0000 (19:50 +0200)

Trivial merge