Merge pull request #2489 from kgaillot/2.1
Fix segmentation fault when remote server IP cannot be resolved