Merge branch 'master' into jgrpp

# Conflicts:
#	.github/workflows/release-linux.yml
#	.github/workflows/release.yml
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/script/api/script_rail.cpp
#	src/settings_gui.cpp
#	src/signal_type.h
#	src/video/sdl2_v.cpp

src/train_cmd.cpp

@@ -3750,7 +3750,7 @@ void FreeTrainTrackReservation(Train *v, TileIndex origin, Trackdir orig_td)
 					break;
 				} else {
 					/* Turn the signal back to red. */
-					if (GetSignalType(tile, TrackdirToTrack(td)) == SIGTYPE_NORMAL) {
+					if (GetSignalType(tile, TrackdirToTrack(td)) == SIGTYPE_BLOCK) {
 						update_signal = true;
 					} else {
 						SetSignalStateByTrackdir(tile, td, SIGNAL_STATE_RED);