Merge changes made in No Gnus