Merge branch 'patch-v1362' into 'master'

Patch v1362

See merge request !7
15 jobs for 2.5.1-1.036.2-4 in 106 minutes and 3 seconds (queued for 3 seconds)
latest
Status Job ID Name Coverage
  Ocgcore
passed #209825
linux
ocgcore_linux

00:01:37

passed #209826
linux
ocgcore_macos

00:01:37

passed #209824
linux
ocgcore_windows

00:01:37

 
  Build And Test
passed #209828
linux
assets_en-US

00:08:15

passed #209827
linux
assets_zh-CN

00:07:44

passed #209829
linux
build-StandaloneLinux64

00:50:23

passed #209830
linux
build-StandaloneOSX

00:27:41

passed #209831
linux
build-StandaloneWindows64

00:51:53

 
  Pack
passed #209837
linux
pack_darwin_en-US

00:07:18

passed #209834
linux
pack_darwin_zh-CN

00:05:27

passed #209836
linux
pack_linux_en-US

00:12:36

passed #209833
linux
pack_linux_zh-CN

00:07:04

passed #209835
linux
pack_win32_en-US

00:05:02

passed #209832
linux
pack_win32_zh-CN

00:04:29

 
  Deploy
passed #209838
linux
upload

00:39:52