Merge branch 'master' into phpng
authorMichael Wallner <mike@php.net>
Fri, 4 Dec 2015 14:17:48 +0000 (15:17 +0100)
committerMichael Wallner <mike@php.net>
Fri, 4 Dec 2015 14:17:48 +0000 (15:17 +0100)

Trivial merge