Merge pull request #889 from feckert/firewall_custom_reload