And now the image.c patch is not needed in emacs-git anymore.