am 9ea30974: (-s ours) Fix bug #3029831 (Finalizing a Cursor that has not been deactivated or closed. database...) - DO NOT MERGE

Merge commit '9ea309741d32d9634a0eb6786f1cc3057d3f82a6'

* commit '9ea309741d32d9634a0eb6786f1cc3057d3f82a6':
  Fix bug #3029831 (Finalizing a Cursor that has not been deactivated or closed. database...) - DO NOT MERGE