Merged from emacs@sv.gnu.org