Merge "Follow-up 42333412833a - Fix behaviour $wgVerifyMimeType = false;"