Merge branch 'master' into jgrpp

# Conflicts:
#	src/base_station_base.h
#	src/newgrf.cpp
#	src/newgrf_class.h
#	src/newgrf_class_func.h
#	src/newgrf_commons.cpp
#	src/newgrf_commons.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_station.cpp
#	src/saveload/newgrf_sl.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp

src/newgrf_extension.h

@@ -103,8 +103,7 @@ enum Action2VariableRemapIds {
 };
 
 enum GRFFeatureTestObservationFlag : uint8 {
-	GFTOF_MORE_OBJECTS_PER_GRF = 0,
-	GFTOF_MORE_ACTION2_IDS,
+	GFTOF_MORE_ACTION2_IDS = 0,
 	GFTOF_TOWN_ZONE_CALLBACK,
 	GFTOF_MORE_VARACTION2_TYPES,
 	GFTOF_MULTI_PART_SHIPS,