Sync image-mode.el with emacs master