Merge branch 'v1.1.x'
authorMichael Wallner <mike@php.net>
Tue, 19 Jan 2016 08:58:55 +0000 (09:58 +0100)
committerMichael Wallner <mike@php.net>
Tue, 19 Jan 2016 08:58:55 +0000 (09:58 +0100)

Trivial merge