Ugly fix for ini files.
Merge ini-file fix from branch 'iniFileHandling' into configFixes