Merge branch 'master' into jgrpp

# Conflicts:
#	src/articulated_vehicles.cpp
#	src/articulated_vehicles.h
#	src/autoreplace_cmd.cpp
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/core/format.hpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/group_gui.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/misc/endian_buffer.hpp
#	src/music/music_driver.hpp
#	src/newgrf_gui.cpp
#	src/rail_cmd.cpp
#	src/road_gui.cpp
#	src/settings_type.h
#	src/strgen/strgen.cpp
#	src/strings.cpp
#	src/timetable_cmd.cpp
#	src/town.h
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/widget.cpp
#	src/widgets/dropdown.cpp
#	src/widgets/road_widget.h

src/core/format.hpp

@@ -31,11 +31,13 @@ struct fmt::formatter<E, Char, std::enable_if_t<std::is_enum<E>::value>> : fmt::
 	using underlying_type = typename std::underlying_type<E>::type;
 	using parent = typename fmt::formatter<underlying_type>;
 
-	constexpr fmt::format_parse_context::iterator parse(fmt::format_parse_context &ctx) {
+	constexpr fmt::format_parse_context::iterator parse(fmt::format_parse_context &ctx)
+	{
 		return parent::parse(ctx);
 	}
 
-	fmt::format_context::iterator format(const E &e, format_context &ctx) const {
+	fmt::format_context::iterator format(const E &e, format_context &ctx) const
+	{
 		return parent::format(underlying_type(e), ctx);
 	}
 };
@@ -45,11 +47,13 @@ struct fmt::formatter<E, Char, std::enable_if_t<std::is_enum<E>::value>> : fmt::
 //	using underlying_type = typename T::Type;
 //	using parent = typename fmt::formatter<underlying_type>;
 //
-//	constexpr fmt::format_parse_context::iterator parse(fmt::format_parse_context &ctx) {
+//	constexpr fmt::format_parse_context::iterator parse(fmt::format_parse_context &ctx)
+//	{
 //		return parent::parse(ctx);
 //	}
 //
-//	fmt::format_context::iterator format(const T &t, format_context &ctx) const {
+//	fmt::format_context::iterator format(const T &t, format_context &ctx) const
+//	{
 //		return parent::format(underlying_type(t), ctx);
 //	}
 //};

src/core/geometry_func.cpp

@@ -62,5 +62,3 @@ Rect BoundingRect(const Rect &r1, const Rect &r2)
 
 	return r;
 }
-
-const RectPadding RectPadding::zero = {0, 0, 0, 0};

src/core/geometry_type.hpp

@@ -65,6 +65,8 @@ struct RectPadding {
 	inline uint Vertical() const { return this->top + this->bottom; }
 };
 
+inline const RectPadding RectPadding::zero{};
+
 /** Specification of a rectangle with absolute coordinates of all edges */
 struct Rect {
 	int left;