Merge branch 'R_2_0'
authorMichael Wallner <mike@php.net>
Tue, 8 Jul 2014 10:14:04 +0000 (12:14 +0200)
committerMichael Wallner <mike@php.net>
Tue, 8 Jul 2014 10:14:04 +0000 (12:14 +0200)

Trivial merge