server: ipv6 support
Merge branch 'master' into server-ipv6

Conflicts:
	server.js
Merge branch 'server-ipv6'