Merge branch 'v1.1.x'
authorMichael Wallner <mike@php.net>
Tue, 17 May 2016 14:35:10 +0000 (16:35 +0200)
committerMichael Wallner <mike@php.net>
Tue, 17 May 2016 14:35:10 +0000 (16:35 +0200)

Trivial merge