Merge branch 'R_1_0'
authorMichael Wallner <mike@php.net>
Tue, 29 Sep 2015 15:11:43 +0000 (17:11 +0200)
committerMichael Wallner <mike@php.net>
Tue, 29 Sep 2015 15:11:43 +0000 (17:11 +0200)

Trivial merge