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

* commit '787d81453ce1e5451bd2c289c8b53cfeda2eab29':
  Fix descriptor leak after accepting connections