Merge remote-tracking branch 'upstream/master' into sprint/HipsterHedgehog.fix.remove-counters-from-faux-activity-posts
