Match MediaWiki's rendering of non-thumb/-frame block images

Change-Id: I43ad72ef2d6b650692e1a0fd4460e4dec70fde7f
Merge "Match MediaWiki's rendering of non-thumb/-frame block images"