Synch with the t-gnus-6_15 branch.