Merge branch 'patch-5' into 'master'

fix--原石の皇脈

See merge request !44
10 jobs for master in 1 minute and 3 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Prepare
passed #123867
linux
merge_databases

00:00:13

 
  Prepare2
passed #123868
linux
json

00:00:21

passed #123869
linux
json2

00:00:14

 
  Pack
passed #123870
linux
neos

00:00:15

passed #123871
linux
pack

00:00:10

passed #123872
linux
server

00:00:07

 
  Deploy
passed #123876
linux
deploy_to_koishi

00:00:12

passed #123875
linux
deploy_to_tiramisu

00:00:11

passed #123873
linux
upload_neos

00:00:06

passed #123874
linux
upload_version_json

00:00:06