Merge branch 'patch-v1362' into 'master'

Patch v1362

See merge request !7
14 jobs for master in 33 minutes and 28 seconds (queued for 9 seconds)
latest
Status Job ID Name Coverage
  Ocgcore
passed #190200
linux
ocgcore_linux

00:00:33

passed #190201
linux
ocgcore_macos

00:02:28

passed #190199
linux
ocgcore_windows

00:00:25

 
  Build And Test
passed #190203
linux
assets_en-US

00:09:08

passed #190202
linux
assets_zh-CN

00:09:32

passed #190204
linux
build-StandaloneLinux64

00:17:00

passed #190205
linux
build-StandaloneOSX

00:03:27

passed #190206
linux
build-StandaloneWindows64

00:03:43

 
  Pack
passed #190212
linux
pack_darwin_en-US

00:08:15

passed #190209
linux
pack_darwin_zh-CN

00:08:14

passed #190211
linux
pack_linux_en-US

00:13:57

passed #190208
linux
pack_linux_zh-CN

00:08:14

passed #190210
linux
pack_win32_en-US

00:08:06

passed #190207
linux
pack_win32_zh-CN

00:07:44