Merge branch 'R_2_1'
authorMichael Wallner <mike@php.net>
Thu, 16 Oct 2014 07:20:05 +0000 (09:20 +0200)
committerMichael Wallner <mike@php.net>
Thu, 16 Oct 2014 07:20:05 +0000 (09:20 +0200)

Trivial merge