am 4a794846: Merge "Fix descriptor leak after accepting connections"

* commit '4a79484648262d5d0dc9e72c3d9cf36c77cca599':
  Fix descriptor leak after accepting connections