Cache file descriptors
Escape plus sign (fixes #1090)
Merge remote-tracking branch 'origin/pr/977'

* origin/pr/977:
  Cache file descriptors
Merge remote-tracking branch 'origin/pr/1091'

* origin/pr/1091:
  Escape plus sign (fixes #1090)