Merge pull request #2135 from reaperhulk/encode-ipaddress

Encode ipaddress