Latest patch for fixing media/resize_image_filter conflicts.