Merge branch 'wait_in_depot-sx' into jgrpp

Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h

src/train_cmd.cpp

@@ -2229,6 +2229,13 @@ static bool CheckTrainStayInDepot(Train *v)
 		return true;
 	}
 
+	if (v->current_order.IsWaitTimetabled()) {
+		v->HandleWaiting(false);
+	}
+	if (v->current_order.IsType(OT_WAITING)) {
+		return true;
+	}
+
 	SigSegState seg_state;
 
 	if (v->force_proceed == TFP_NONE) {