Merge branch 'more-config-types'
authorMichael Wallner <mike@php.net>
Mon, 18 Jan 2016 12:34:20 +0000 (13:34 +0100)
committerMichael Wallner <mike@php.net>
Mon, 18 Jan 2016 12:34:20 +0000 (13:34 +0100)

Trivial merge