manually merged bugid-96110 because of conflicts in WikiaValidatorImageSize.class.php