Merge branch 'v2.6.x'
authorMichael Wallner <mike@php.net>
Mon, 12 Sep 2016 06:54:16 +0000 (08:54 +0200)
committerMichael Wallner <mike@php.net>
Mon, 12 Sep 2016 06:54:16 +0000 (08:54 +0200)

Trivial merge