Merge pull request #2549 from yanganto/socket-addr