Merge remote-tracking branch 'upstream/master' into sprint/HipsterHedgehog.feat.ability-to-copy-and-paste-images-into-posts-and-comments
