Merge branch 'patch-v1362' into 'master'

Patch v1362

See merge request !7
19 jobs for 2.5.1-1.036.2-4.1 in 174 minutes and 3 seconds (queued for 6 seconds)
latest
Status Job ID Name Coverage
  Ocgcore
passed #210868
linux
ocgcore_linux

00:00:45

passed #210869
linux
ocgcore_macos

00:00:44

passed #210867
linux
ocgcore_windows

00:00:47

 
  Build And Test
passed #210871
linux
assets_en-US

00:19:28

passed #210870
linux
assets_zh-CN

00:08:29

passed #210886
linux
build-StandaloneLinux64

00:19:15

passed #210873
linux
build-StandaloneOSX

01:31:39

passed #210874
linux
build-StandaloneWindows64

01:32:22

failed #210885
linux
build-StandaloneLinux64

00:11:54

failed #210872
linux
build-StandaloneLinux64

00:44:27

 
  Pack
passed #210880
linux
pack_darwin_en-US

00:04:30

passed #210877
linux
pack_darwin_zh-CN

00:05:41

passed #210879
linux
pack_linux_en-US

00:08:30

passed #210876
linux
pack_linux_zh-CN

00:05:24

passed #210887
linux
pack_win32_en-US

00:05:18

passed #210888
linux
pack_win32_zh-CN

00:03:57

failed #210878
linux
pack_win32_en-US

00:01:50

failed #210875
linux
pack_win32_zh-CN

01:51:49

 
  Deploy
passed #210881
linux
upload

00:43:49