Merge changes made in Gnus.tranck