Merge branch 'master' into jgrpp

# Conflicts:
#	src/fios_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt

src/newgrf.cpp

@@ -9152,6 +9152,8 @@ static void FinaliseEngineArray()
 			}
 		}
 
+		if (!HasBit(e->info.climates, _settings_game.game_creation.landscape)) continue;
+
 		/* When the train does not set property 27 (misc flags), but it
 		 * is overridden by a NewGRF graphically we want to disable the
 		 * flipping possibility. */