Merge branch 'R_2_3'
authorMichael Wallner <mike@php.net>
Mon, 2 Mar 2015 14:09:59 +0000 (15:09 +0100)
committerMichael Wallner <mike@php.net>
Mon, 2 Mar 2015 14:09:59 +0000 (15:09 +0100)

Trivial merge