Synch with Gnus trunk.