Trying to fix issue #297
Merge remote-tracking branch 'upstream/master' into fix-pcap2
Merge pull request #316 from LocutusOfBorg/fix-pcap2

Trying to fix issue #297