Merge branch 'jgrpp' into jgrpp-beta

# Conflicts:
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/currency_settings.ini
#	src/table/gameopt_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/table/win32_settings.ini
#	src/table/window_settings.ini

src/os/macosx/crashlog_osx.cpp

@@ -492,6 +492,13 @@ void CDECL HandleCrash(int signum, siginfo_t *si, void *context)
 	log.MakeDesyncCrashLog(log_in, log_out, info);
 }
 
+/* static */ void CrashLog::InconsistencyLog(const InconsistencyExtraInfo &info)
+{
+	CrashLogOSX log(CrashLogOSX::DesyncTag{});
+	log.MakeInconsistencyLog(info);
+}
+
+
 /* static */ void CrashLog::VersionInfoLog()
 {
 	CrashLogOSX log(CrashLogOSX::DesyncTag{});

src/os/macosx/font_osx.cpp

@@ -215,6 +215,8 @@ void CoreTextFontCache::SetFontSize(int pixels)
 	this->descender = -(int)std::ceil(CTFontGetDescent(this->font.get()));
 	this->height = this->ascender - this->descender;
 
+	font_height_cache[this->fs] = this->GetHeight();
+
 	/* Get real font name. */
 	char name[128];
 	CFAutoRelease<CFStringRef> font_name((CFStringRef)CTFontCopyAttribute(this->font.get(), kCTFontDisplayNameAttribute));

src/os/unix/crashlog_unix.cpp

@@ -628,6 +628,12 @@ static void CDECL HandleCrash(int signum)
 	log.MakeDesyncCrashLog(log_in, log_out, info);
 }
 
+/* static */ void CrashLog::InconsistencyLog(const InconsistencyExtraInfo &info)
+{
+	CrashLogUnix log(CrashLogUnix::DesyncTag{});
+	log.MakeInconsistencyLog(info);
+}
+
 /* static */ void CrashLog::VersionInfoLog()
 {
 	CrashLogUnix log(CrashLogUnix::DesyncTag{});

src/os/windows/crashlog_win.cpp

@@ -758,6 +758,12 @@ static void CDECL CustomAbort(int signal)
 	log.MakeDesyncCrashLog(log_in, log_out, info);
 }
 
+/* static */ void CrashLog::InconsistencyLog(const InconsistencyExtraInfo &info)
+{
+	CrashLogWindows log(nullptr);
+	log.MakeInconsistencyLog(info);
+}
+
 /* static */ void CrashLog::VersionInfoLog()
 {
 	CrashLogWindows log(nullptr);