am 9dbef975: Merge "Avoid leaking sockets." into gingerbread

* commit '9dbef975f0f4370dfe48a0fb040e3d8d1eb91d87':
  Avoid leaking sockets.