Merge branch 'v3.1.x'
authorMichael Wallner <mike@php.net>
Mon, 3 Jul 2017 07:59:08 +0000 (09:59 +0200)
committerMichael Wallner <mike@php.net>
Mon, 3 Jul 2017 07:59:08 +0000 (09:59 +0200)

Trivial merge