Update to add static NAT translations to the IPv4 address space
See Bug report #971
# This is a combination of 2 commits.
# The first commit's message is:

Additions to patch supplied by Tim Wilkes

Final Credit for the pull request to me

# This is the 2nd commit message:

Additions to patch supplied by Tim Wilkes

Final Credit for the pull request to me