Merge "Fix a Cursor leak"