Merge remote-tracking branch 'upstream/master' into git.m6w6.name
authorMichael Wallner <mike@php.net>
Fri, 8 Mar 2019 10:57:21 +0000 (11:57 +0100)
committerMichael Wallner <mike@php.net>
Fri, 8 Mar 2019 10:57:21 +0000 (11:57 +0100)

Trivial merge