Merge pull request #689 from pushkarnk/task-cancel