Merge branch 'master' into jgrpp

# Conflicts:
#	regression/regression/result.txt
#	src/autoreplace_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/network/network_content.cpp
#	src/newgrf_roadstop.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/road_gui.cpp
#	src/saveload/ai_sl.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/station.cpp
#	src/station_gui.cpp
#	src/video/cocoa/cocoa_ogl.h
#	src/video/sdl2_opengl_v.h
#	src/video/video_driver.hpp
#	src/video/win32_v.h
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h
#	src/window.cpp

src/widgets/station_widget.h

@@ -48,13 +48,10 @@ enum StationListWidgets : WidgetID {
 	WID_STL_SHIP,           ///< 'SHIP' button - list only facilities where is a dock.
 	WID_STL_FACILALL,       ///< 'ALL' button - list all facilities.
 
-	WID_STL_NOCARGOWAITING, ///< 'NO' button - list stations where no cargo is waiting.
-	WID_STL_CARGOALL,       ///< 'ALL' button - list all stations.
-
 	WID_STL_SORTBY,         ///< 'Sort by' button - reverse sort direction.
 	WID_STL_SORTDROPBTN,    ///< Dropdown button.
 
-	WID_STL_CARGOSTART,     ///< Widget numbers used for list of cargo types (not present in _company_stations_widgets).
+	WID_STL_CARGODROPDOWN,  ///< Cargo type dropdown list.
 };
 
 /** Widgets of the #SelectStationWindow class. */