Merge pull request #193 from ddunbar/core-wait-for-tasks-on-cancellation

[Core] Fix a race condition in task cancellation.