Add tiny media objects.
Merge branch 'media-tiny'