am 7648b37d: Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev

* commit '7648b37d1e4cf3799288f85cc9c5f67b515e24c4':
  Make sure all FDs are correctly closed.