Merge remote-tracking branch 'upstream/master' into color-picker

Source/Engine/Platform/Base/ThreadBase.cpp

@@ -7,7 +7,7 @@
 #include "Engine/Scripting/ManagedCLR/MCore.h"
 #if TRACY_ENABLE
 #include "Engine/Core/Math/Math.h"
-#include <ThirdParty/tracy/Tracy.h>
+#include <ThirdParty/tracy/tracy/Tracy.hpp>
 #endif
 
 Delegate<Thread*> ThreadBase::ThreadStarting;

Source/Engine/Platform/Linux/LinuxPlatform.cpp

@@ -2047,12 +2047,12 @@ bool LinuxPlatform::Init()
     // Get user locale string
     setlocale(LC_ALL, "");
     const char* locale = setlocale(LC_CTYPE, NULL);
-    if (strcmp(locale, "C") == 0)
-        locale = "";
     UserLocale = String(locale);
     if (UserLocale.FindLast('.') != -1)
         UserLocale = UserLocale.Left(UserLocale.Find('.'));
     UserLocale.Replace('_', '-');
+    if (UserLocale == TEXT("C"))
+        UserLocale = TEXT("en");
 
     // Get computer name string
     gethostname(buffer, UNIX_APP_BUFF_SIZE);