Merge "Don't replace file extension when mime-type is incorrect"