Bugfix: configfile parameter was not properly used for settings in all cases
Merge branch 'master' into responsive