Merge pull request #5320 from systemcrash/firewall_ipv6_icmp