* Strip secrets out of the parent brand config
Merge remote-tracking branch 'origin/master'