Merge remote-tracking branch 'upstream/master' into sprint/HipsterHedgehog.feat.add-gif-flag-to-activities
