am 17750fdd: Merge "Clean up cursors in try/finally"

* commit '17750fdd5a17ff94af48e35a7fe55dc7231763ae':
  Clean up cursors in try/finally