Patch to handle unicode image names.