Merge branch 'master' into jgrpp

# Conflicts:
#	src/error.h
#	src/error_gui.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/misc_gui.cpp
#	src/newgrf_gui.cpp
#	src/news_gui.cpp
#	src/rail_cmd.cpp
#	src/saveload/gamelog_sl.cpp
#	src/script/api/script_text.cpp
#	src/script/script_instance.cpp
#	src/statusbar_gui.cpp
#	src/strings.cpp
#	src/strings_func.h
#	src/strings_internal.h
#	src/table/settings/gui_settings.ini
#	src/table/settings/linkgraph_settings.ini
#	src/textbuf_gui.h

src/core/math_func.hpp

@@ -170,12 +170,12 @@ constexpr To ClampTo(From value)
 	static_assert(std::numeric_limits<To>::is_integer, "Do not clamp from non-integer values");
 	static_assert(std::numeric_limits<From>::is_integer, "Do not clamp to non-integer values");
 
-	if (sizeof(To) >= sizeof(From) && std::numeric_limits<To>::is_signed == std::numeric_limits<From>::is_signed) {
+	if constexpr (sizeof(To) >= sizeof(From) && std::numeric_limits<To>::is_signed == std::numeric_limits<From>::is_signed) {
 		/* Same signedness and To type is larger or equal than From type, no clamping is required. */
 		return static_cast<To>(value);
 	}
 
-	if (sizeof(To) > sizeof(From) && std::numeric_limits<To>::is_signed) {
+	if constexpr (sizeof(To) > sizeof(From) && std::numeric_limits<To>::is_signed) {
 		/* Signed destination and a larger To type, no clamping is required. */
 		return static_cast<To>(value);
 	}