Merge "Fix cursor leak."