Merge pull request #2670 from yanganto/socket-addr-to-string