Merge branch 'R_2_1'
authorMichael Wallner <mike@php.net>
Mon, 1 Sep 2014 09:32:32 +0000 (11:32 +0200)
committerMichael Wallner <mike@php.net>
Mon, 1 Sep 2014 09:32:32 +0000 (11:32 +0200)

Trivial merge