Merge branch 'catch' into v1.x
authorMichael Wallner <mike@php.net>
Tue, 13 Oct 2020 16:24:11 +0000 (18:24 +0200)
committerMichael Wallner <mike@php.net>
Tue, 13 Oct 2020 16:24:11 +0000 (18:24 +0200)

Trivial merge