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/debug.cpp

@@ -11,6 +11,7 @@
 #include <stdarg.h>
 #include "console_func.h"
 #include "debug.h"
+#include "debug_fmt.h"
 #include "string_func.h"
 #include "fileio_func.h"
 #include "settings_type.h"
@@ -458,3 +459,10 @@ void DebugReconsiderSendRemoteMessages()
 
 	_debug_remote_console.store(enable);
 }
+
+void TicToc::PrintAndReset()
+{
+	Debug(misc, 0, "[{}] {} us [avg: {:.1f} us]", this->state.name, this->state.chrono_sum, this->state.chrono_sum / static_cast<double>(this->state.count));
+	this->state.count = 0;
+	this->state.chrono_sum = 0;
+}