Merge "Add better error message for files which exceeds $wgMaxImageArea"