am 02562d30: Merge "Avoid leaking cursors"

* commit '02562d300310909e30782b907a8c0cbdf76f14af':
  Avoid leaking cursors