Merge branch 'v1.1.x'
authorMichael Wallner <mike@php.net>
Fri, 20 May 2016 08:09:32 +0000 (10:09 +0200)
committerMichael Wallner <mike@php.net>
Fri, 20 May 2016 08:09:32 +0000 (10:09 +0200)

Trivial merge