Merge branch 'patch-2' into 'master'

fix

See merge request !38
10 jobs for master in 49 seconds (queued for 1 second)
Status Job ID Name Coverage
  Prepare
passed #123739
linux
merge_databases

00:00:08

 
  Prepare2
passed #123740
linux
json

00:00:17

passed #123741
linux
json2

00:00:17

 
  Pack
passed #123742
linux
neos

00:00:11

passed #123743
linux
pack

00:00:09

passed #123744
linux
server

00:00:05

 
  Deploy
passed #123748
linux
deploy_to_koishi

00:00:10

passed #123747
linux
deploy_to_tiramisu

00:00:10

passed #123745
linux
upload_neos

00:00:05

passed #123746
linux
upload_version_json

00:00:06