Merge bugfixes done in Gnus trunk