Merge branch 'master' into jgrpp

# Conflicts:
#	src/company_cmd.cpp
#	src/core/geometry_func.cpp
#	src/date.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/object_gui.cpp
#	src/openttd.cpp
#	src/settings_type.h
#	src/video/allegro_v.cpp
#	src/video/dedicated_v.cpp
#	src/video/null_v.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp

src/debug.h

@@ -134,6 +134,15 @@ const char *GetLogPrefix();
 /** The real time in the game. */
 extern uint32 _realtime_tick;
 
+inline void IncreaseRealtimeTick(uint32 increase)
+{
+#if defined(__GNUC__) || defined(__clang__)
+	__atomic_add_fetch(&_realtime_tick, increase, __ATOMIC_RELAXED);
+#else
+	_realtime_tick += increase;
+#endif
+}
+
 void ClearDesyncMsgLog();
 void LogDesyncMsg(std::string msg);
 char *DumpDesyncMsgLog(char *buffer, const char *last);