Merge branch 'v1.0.x'
authorMichael Wallner <mike@php.net>
Wed, 30 Sep 2015 10:21:17 +0000 (12:21 +0200)
committerMichael Wallner <mike@php.net>
Wed, 30 Sep 2015 10:21:17 +0000 (12:21 +0200)

Trivial merge