bugfix for nntp
Merge branch 'master' into jupis