Apply patch from Michael. Empty task queue when aborting.
Closes lp:1121297, thanks Michael.