Merging in changes from #3594
Merge pull request #3622 from techhat/iptables

Merging in changes from #3594