#845 Display rich text in media download blocks
Merge remote-tracking branch 'origin/master'