Fix config.
Merge branch 'devel'