Merge from emacs--rel--22, gnus--devo--0