Merge branch 'master' into phpng
authorMichael Wallner <mike@php.net>
Fri, 12 Jun 2015 07:39:46 +0000 (09:39 +0200)
committerMichael Wallner <mike@php.net>
Fri, 12 Jun 2015 07:39:46 +0000 (09:39 +0200)

Trivial merge