am d77d17c2: Merge "Fix cursor memory leak"

* commit 'd77d17c28d6f120ceb648747c7e2ef1a50215700':
  Fix cursor memory leak