Remove polling from cancellation (bug 1037367)
Merge pull request #88 from muffinresearch/rip-out-cancelled

Remove polling from cancellation (bug 1037367)