Merge branch 'master' into plugins
update config file templates
Merge branch 'master' into plugins
Merge branch 'plugins' into theme-jer