am a5f756c9: Merge "Prevent cursor from causing global reference leaks."

* commit 'a5f756c9e66ee81585ba81d13a8e13f809bdd875':
  Prevent cursor from causing global reference leaks.