Merge from emacs--rel--22