Merge changes made in Gnus master