Sync up with Gnus 5.6.11.(again)