Merge changes made in Gnus trunk.