From firewall3 repo commit 0367860636aa55e9ee064709ec2814906e1f246b 7 Nov 2016
