Merge remote-tracking branch 'upstream/master' into...

Merge remote-tracking branch 'upstream/master' into sprint/CleverChipmunk.feat.ability-to-disable-group-conversations

# Conflicts:
#	src/app/modules/groups/profile/profile.html