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/departures_gui.cpp

@@ -194,8 +194,7 @@ protected:
 			if (width > this->group_width) this->group_width = width;
 		}
 
-		uint owner;
-		FOR_EACH_SET_BIT(owner, companies) {
+		for (uint owner : SetBitIterator(companies)) {
 			SetDParam(0, owner);
 			int width = (GetStringBoundingBox(STR_DEPARTURES_TOC)).width + 4;
 			if (width > this->toc_width) this->toc_width = width;