Merge "Fix bug with bind()/connect() and IPv4 addresses"