Out-of sync with upstream

[reactive-firewall]

Need to resolve changes between upstream and this version

See shundor#2

[reactive-firewall]

BLOCKED

Caution

Status: Awaiting action from maintainer on: shundor#6