Merge remote-tracking branch 'upstream/master' into sprint/GiddyGiraffe.feat.ability-for-channels-to-self-declare-nsfw
