Merge branch 'DEV_2' into HEAD
authorMichael Wallner <mike@php.net>
Tue, 5 Aug 2014 16:46:17 +0000 (18:46 +0200)
committerMichael Wallner <mike@php.net>
Tue, 5 Aug 2014 16:46:17 +0000 (18:46 +0200)

Trivial merge