Handle multiple ini files.
Merge branch 'iniFileHandling' into configFixes