Merge branch 'patch-v1362' into 'master'

Patch v1362

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

00:01:36

passed #205036
linux
ocgcore_macos

00:00:23

passed #205034
linux
ocgcore_windows

00:00:06

 
  Build And Test
canceled #205038
linux
assets_en-US

00:00:29

canceled #205037
linux
assets_zh-CN

00:00:29

canceled #205039
linux
build-StandaloneLinux64

00:00:29

canceled #205040
linux
build-StandaloneOSX

00:00:27

canceled #205041
linux
build-StandaloneWindows64

00:00:27

 
  Pack
canceled #205047
linux
pack_darwin_en-US

canceled #205044
linux
pack_darwin_zh-CN

canceled #205046
linux
pack_linux_en-US

canceled #205043
linux
pack_linux_zh-CN

canceled #205045
linux
pack_win32_en-US

canceled #205042
linux
pack_win32_zh-CN

 
  Deploy
canceled #205048
linux
upload