am 237da705: Merge "fix fd leaking"

* commit '237da7058bb0e22cf117766435dd5e578c16e4ef':
  fix fd leaking