Merge pull request #746 from chrisdail/master

[#1803] Added support for IPv6 IP address for the server