Merge branch 'master' into jgrpp

# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h

src/saveload/oldloader.cpp

@@ -265,7 +265,7 @@ static SavegameType DetermineOldSavegameType(FILE *f, char *title, const char *l
 			case SGT_TTD: title = strecpy(title, "(TTD) ", last);    break;
 			default:      title = strecpy(title, "(broken) ", last); break;
 		}
-		title = strecpy(title, temp, last);
+		strecpy(title, temp, last);
 	}
 
 	return type;