merge
authorMichael Wallner <mike@php.net>
Fri, 1 Aug 2014 11:47:01 +0000 (13:47 +0200)
committerMichael Wallner <mike@php.net>
Fri, 1 Aug 2014 11:47:01 +0000 (13:47 +0200)

Trivial merge