Backport Abandonment from Async
Merge pull request #147 from fly-man-/master

Backporting Abandonment from Async