Merge branch 'R_2_1'
authorMichael Wallner <mike@php.net>
Thu, 6 Nov 2014 15:23:38 +0000 (16:23 +0100)
committerMichael Wallner <mike@php.net>
Thu, 6 Nov 2014 15:23:38 +0000 (16:23 +0100)

Trivial merge