Merge branch 'master' into jgrpp

# Conflicts:
#	cmake/CompileFlags.cmake
#	src/cargomonitor.cpp
#	src/core/CMakeLists.txt
#	src/economy.cpp
#	src/landscape.cpp
#	src/linkgraph/flowmapper.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/misc_gui.cpp
#	src/newgrf_generic.cpp
#	src/newgrf_storage.cpp
#	src/rail_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/station_sl.cpp
#	src/script/script_gui.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/string_func.h
#	src/terraform_cmd.cpp

src/newgrf_town.cpp

@@ -36,9 +36,8 @@
 				grfid = this->ro.grffile->grfid;
 			}
 
-			std::list<PersistentStorage *>::iterator iter;
-			for (iter = this->t->psa_list.begin(); iter != this->t->psa_list.end(); iter++) {
-				if ((*iter)->grfid == grfid) return (*iter)->GetValue(parameter);
+			for (auto &it : this->t->psa_list) {
+				if (it->grfid == grfid) return it->GetValue(parameter);
 			}
 
 			return 0;
@@ -146,10 +145,9 @@
 	if (grfid != this->ro.grffile->grfid) return;
 
 	/* Check if the storage exists. */
-	std::list<PersistentStorage *>::iterator iter;
-	for (iter = t->psa_list.begin(); iter != t->psa_list.end(); iter++) {
-		if ((*iter)->grfid == grfid) {
-			(*iter)->StoreValue(pos, value);
+	for (auto &it : t->psa_list) {
+		if (it->grfid == grfid) {
+			it->StoreValue(pos, value);
 			return;
 		}
 	}