Fixed an issue with ARP packets not setting the mac addresses
Merge branch 'arp-fix'