Merge branch 'master' into jgrpp

# Conflicts:
#	src/autoreplace_cmd.cpp
#	src/company_base.h
#	src/company_gui.cpp
#	src/cpu.cpp
#	src/debug.h
#	src/group.h
#	src/group_cmd.cpp
#	src/house.h
#	src/industry.h
#	src/newgrf_house.cpp
#	src/news_type.h
#	src/openttd.cpp
#	src/saveload/company_sl.cpp
#	src/settings_type.h
#	src/sl/oldloader_sl.cpp
#	src/story.cpp
#	src/table/town_land.h
#	src/viewport.cpp

src/house.h

@@ -120,7 +120,7 @@ struct HouseSpec {
 	/* NewHouses properties */
 	GRFFileProps grf_prop;                    ///< Properties related the the grf file
 	uint16_t callback_mask;                   ///< Bitmask of house callbacks that have to be called
-	byte random_colour[4];                    ///< 4 "random" colours
+	Colours random_colour[4];                 ///< 4 "random" colours
 	byte probability;                         ///< Relative probability of appearing (16 is the standard value)
 	HouseExtraFlags extra_flags;              ///< some more flags
 	HouseCtrlFlags ctrl_flags;                ///< control flags