Merge branch 'R_2_3'
authorMichael Wallner <mike@php.net>
Thu, 12 Mar 2015 07:11:02 +0000 (08:11 +0100)
committerMichael Wallner <mike@php.net>
Thu, 12 Mar 2015 07:11:02 +0000 (08:11 +0100)

Trivial merge