Merge branch 'R_2_1'
authorMichael Wallner <mike@php.net>
Thu, 25 Sep 2014 07:30:38 +0000 (09:30 +0200)
committerMichael Wallner <mike@php.net>
Thu, 25 Sep 2014 07:30:38 +0000 (09:30 +0200)

Trivial merge