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

Trivial merge