Merge branch 'R_2_5'
authorMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 07:38:17 +0000 (09:38 +0200)
committerMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 07:38:17 +0000 (09:38 +0200)

Trivial merge