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/table/settings/game_settings.ini

@@ -413,7 +413,7 @@ var      = vehicle.smoke_amount
 type     = SLE_UINT8
 from     = SLV_145
 flags    = SF_GUI_DROPDOWN
-def      = 1
+def      = 2
 min      = 0
 max      = 2
 str      = STR_CONFIG_SETTING_SMOKE_AMOUNT