Merge pull request #1789 from MikePetullo/scapy