Merge branch 'more-config-types'
[m6w6/ext-psi] / EXPERIMENTAL
1