Merge pull request #544 from crocogorical/fix/netbios_dead_code