Merge branch 'master' into jgrpp

# Conflicts:
#	src/cheat_gui.cpp
#	src/main_gui.cpp
#	src/network/network_gui.cpp
#	src/saveload/saveload.h
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
#	src/timetable_cmd.cpp
#	src/toolbar_gui.cpp
#	src/widget.cpp
#	src/widget_type.h
#	src/widgets/dropdown_type.h

src/settings_gui.cpp

@@ -497,7 +497,7 @@ struct GameOptionsWindow : Window {
 						Dimension string_dim;
 						int width = ddli->Width();
 						string_dim.width = width + padding.width;
-						string_dim.height = ddli->Height(width) + padding.height;
+						string_dim.height = ddli->Height() + padding.height;
 						*size = maxdim(*size, string_dim);
 					}
 				}