Merge branch 'patch-4' into 'master'

fix原石号咆、原石鸣狞

See merge request !46
10 jobs for master in 50 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Prepare
passed #123923
linux
merge_databases

00:00:12

 
  Prepare2
passed #123924
linux
json

00:00:12

passed #123925
linux
json2

00:00:12

 
  Pack
passed #123926
linux
neos

00:00:11

passed #123927
linux
pack

00:00:12

passed #123928
linux
server

00:00:07

 
  Deploy
passed #123932
linux
deploy_to_koishi

00:00:10

passed #123931
linux
deploy_to_tiramisu

00:00:11

passed #123929
linux
upload_neos

00:00:06

passed #123930
linux
upload_version_json

00:00:08