Better support for MediaWiki block level images (thumb and frame)

Change-Id: Id6f65e4e1971e21035c89f32fa7ab0009c84695c
Merge "Better support for MediaWiki block level images (thumb and frame)"