Merge branch 'R_2_1'
authorMichael Wallner <mike@php.net>
Tue, 9 Sep 2014 07:58:09 +0000 (09:58 +0200)
committerMichael Wallner <mike@php.net>
Tue, 9 Sep 2014 07:58:09 +0000 (09:58 +0200)

Trivial merge