Merge branch 'master' into v3

watch.go

@@ -92,6 +92,10 @@ func (e *Executor) watchTasks(calls ...taskfile.Call) error {
 }
 
 func isContextError(err error) bool {
+	if taskRunErr, ok := err.(*taskRunError); ok {
+		err = taskRunErr.err
+	}
+
 	return err == context.Canceled || err == context.DeadlineExceeded
 }