Merge remote-tracking branch 'origin/master'
Added explanatory comments for overwriting the default config conventions