Merge remote-tracking branch 'origin/bug_747_cancel_waiting_tasks'