Merge branch 'patch-v1362' into 'master'

Patch v1362

See merge request !7
19 jobs for 2.5.1-1.036.2-1.1 in 168 minutes and 22 seconds (queued for 5 seconds)
latest
Status Job ID Name Coverage
  Ocgcore
passed #198550
linux
ocgcore_linux

00:00:33

passed #198551
linux
ocgcore_macos

00:03:07

passed #198549
linux
ocgcore_windows

00:00:34

 
  Build And Test
passed #198553
linux
assets_en-US

00:07:07

passed #198552
linux
assets_zh-CN

00:09:31

passed #198613
linux
build-StandaloneLinux64

00:56:38

passed #198555
linux
build-StandaloneOSX

01:28:47

passed #198626
linux
build-StandaloneWindows64

00:14:02

failed #198611
linux
build-StandaloneLinux64

00:00:12

failed #198554
linux
build-StandaloneLinux64

00:52:08

failed #198612
linux
build-StandaloneWindows64

00:53:05

failed #198556
linux
build-StandaloneWindows64

00:53:54

 
  Pack
passed #198562
linux
pack_darwin_en-US

00:04:31

passed #198559
linux
pack_darwin_zh-CN

00:05:36

passed #198561
linux
pack_linux_en-US

00:09:18

passed #198558
linux
pack_linux_zh-CN

00:09:12

passed #198560
linux
pack_win32_en-US

00:12:57

passed #198557
linux
pack_win32_zh-CN

00:09:12

 
  Deploy
passed #198563
linux
upload

00:21:14