Merge branch 'R_1_1'
authorMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 09:06:18 +0000 (11:06 +0200)
committerMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 09:06:18 +0000 (11:06 +0200)

Trivial merge