m: Fix comment in config file
Merge branch 'master' of github.com:CavalierBlanc/CBClient into upstream
Merge branch 'upstream'