Merge branch 'stable-1.4.20'

To retrieve:

iptables: state match incompatibilty across versions