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