Merge from `emacs-23'.