Merge branch 'master' into jgrpp

# Conflicts:
#	src/cheat_gui.cpp
#	src/industry_gui.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/misc/getoptdata.h
#	src/music/dmusic.cpp
#	src/network/core/os_abstraction.cpp
#	src/newgrf_engine.cpp
#	src/openttd.cpp
#	src/order_gui.cpp
#	src/os/windows/win32.cpp
#	src/pathfinder/npf/queue.cpp
#	src/smallmap_gui.cpp
#	src/strgen/strgen.cpp

src/company_gui.cpp

@@ -2379,8 +2379,8 @@ struct CompanyWindow : Window
 
 			case WID_C_DESC_VEHICLE_COUNTS:
 				SetDParamMaxValue(0, 5000); // Maximum number of vehicles
-				for (uint i = 0; i < lengthof(_company_view_vehicle_count_strings); i++) {
-					size.width = std::max(size.width, GetStringBoundingBox(_company_view_vehicle_count_strings[i]).width + padding.width);
+				for (const auto &count_string : _company_view_vehicle_count_strings) {
+					size.width = std::max(size.width, GetStringBoundingBox(count_string).width + padding.width);
 				}
 				break;