Merge branch 'v1.1.x'
authorMichael Wallner <mike@php.net>
Thu, 3 Dec 2015 09:30:47 +0000 (10:30 +0100)
committerMichael Wallner <mike@php.net>
Thu, 3 Dec 2015 09:30:47 +0000 (10:30 +0100)

Trivial merge