Merge "mediawiki.skinning: Only apply tright/tleft margins to frame/thumb"