Synch with Emacs trunk: