Merge branch 'R_2_3'
authorMichael Wallner <mike@php.net>
Sun, 1 Mar 2015 13:30:47 +0000 (14:30 +0100)
committerMichael Wallner <mike@php.net>
Sun, 1 Mar 2015 13:30:47 +0000 (14:30 +0100)

Trivial merge