Merge from gnus--rel--5.10