Update the config file
Merge branch 'hotfix-1.1.2'
Merge branch 'master' into develop