Merge branch 'master' into sandbox
NAT rules fix. Masquerading will be the last rule for now.
Merge branch 'sandbox'