Merge branch 'R_2_1'
authorMichael Wallner <mike@php.net>
Tue, 9 Sep 2014 08:00:01 +0000 (10:00 +0200)
committerMichael Wallner <mike@php.net>
Tue, 9 Sep 2014 08:00:01 +0000 (10:00 +0200)

Trivial merge