Merge branch 'v1.0.x'
authorMichael Wallner <mike@php.net>
Tue, 19 Jan 2016 09:30:29 +0000 (10:30 +0100)
committerMichael Wallner <mike@php.net>
Tue, 19 Jan 2016 09:30:29 +0000 (10:30 +0100)

Trivial merge