Merge branch 'master' into jgrpp-beta

# Conflicts:
#	src/economy.cpp
#	src/elrail.cpp
#	src/graph_gui.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/core/game_info.cpp
#	src/newgrf_station.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/strings_func.h
#	src/table/settings/network_settings.ini
#	src/table/settings/settings.ini

src/table/newgrf_debug_data.h

@@ -1107,8 +1107,7 @@ class NIHTown : public NIHelper {
 
 		if (t->have_ratings != 0) {
 			print("  Company ratings:");
-			uint8 bit;
-			FOR_EACH_SET_BIT(bit, t->have_ratings) {
+			for (uint8 bit : SetBitIterator(t->have_ratings)) {
 				seprintf(buffer, lastof(buffer), "    %u: %d", bit, t->ratings[bit]);
 				print(buffer);
 			}