Fix disabled channels not being properly set when loading a channel map config file
Merge remote-tracking branch 'origin/master'