Merge: rev756 (Add gargoyle switch support for brands, while still honouring the settings.BRAND config option if it is anything but the default.)