Merge branch 'R_2_0'
authorMichael Wallner <mike@php.net>
Fri, 11 Jul 2014 08:59:54 +0000 (10:59 +0200)
committerMichael Wallner <mike@php.net>
Fri, 11 Jul 2014 08:59:54 +0000 (10:59 +0200)

Trivial merge