Merge branch 'R_2_1'
authorMichael Wallner <mike@php.net>
Thu, 25 Sep 2014 13:35:31 +0000 (15:35 +0200)
committerMichael Wallner <mike@php.net>
Thu, 25 Sep 2014 13:35:31 +0000 (15:35 +0200)

Trivial merge