Merge branch 'R_2_0'
authorMichael Wallner <mike@php.net>
Wed, 9 Jul 2014 18:34:04 +0000 (20:34 +0200)
committerMichael Wallner <mike@php.net>
Wed, 9 Jul 2014 18:34:04 +0000 (20:34 +0200)

Trivial merge