Fix typo in config setting
Merge branch 'master' into develop