Merge branch 'master' into phpng
authorMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 09:38:56 +0000 (11:38 +0200)
committerMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 09:38:56 +0000 (11:38 +0200)

Trivial merge