am 69b04a70: am 2feafeff: Merge "Fix a problem with leaking UDP sockets." into kraken