Merge in library/udp fixes.