Merge branch 'R_1_1'
authorMichael Wallner <mike@php.net>
Fri, 4 Sep 2015 11:09:08 +0000 (13:09 +0200)
committerMichael Wallner <mike@php.net>
Fri, 4 Sep 2015 11:09:08 +0000 (13:09 +0200)

Trivial merge