Merge branch 'PPed72-net-nntp/pan_fix_crash_at_startup'