Improve server IP/hostname handling.
update version
Merge branch '3.3'