Merge branch 'patch-v1362' into 'master'

Patch v1362

See merge request !7
19 jobs for 2.5.1-1.036.2-1.2 in 126 minutes and 55 seconds (queued for 5 seconds)
latest
Status Job ID Name Coverage
  Ocgcore
passed #204122
linux
ocgcore_linux

00:00:38

passed #204123
linux
ocgcore_macos

00:00:06

passed #204121
linux
ocgcore_windows

00:00:40

 
  Build And Test
passed #204136
linux
assets_en-US

00:06:19

passed #204139
linux
assets_zh-CN

00:06:04

passed #204137
linux
build-StandaloneLinux64

00:59:10

passed #204127
linux
build-StandaloneOSX

01:16:31

passed #204138
linux
build-StandaloneWindows64

01:15:25

failed #204125
linux
assets_en-US

00:00:18

canceled #204124
linux
assets_zh-CN

01:13:01

failed #204126
linux
build-StandaloneLinux64

00:00:22

failed #204128
linux
build-StandaloneWindows64

00:00:22

 
  Pack
passed #204134
linux
pack_darwin_en-US

00:11:29

passed #204131
linux
pack_darwin_zh-CN

00:05:00

passed #204133
linux
pack_linux_en-US

00:06:12

passed #204130
linux
pack_linux_zh-CN

00:05:05

passed #204132
linux
pack_win32_en-US

00:06:04

passed #204129
linux
pack_win32_zh-CN

00:05:01

 
  Deploy
passed #204135
linux
upload

00:35:32