Merge branch 'v2.6.x'
authorMichael Wallner <mike@php.net>
Wed, 5 Oct 2016 06:23:19 +0000 (08:23 +0200)
committerMichael Wallner <mike@php.net>
Wed, 5 Oct 2016 06:23:19 +0000 (08:23 +0200)

Trivial merge