Merge branch 'patch-2' into 'master'

fix2

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

00:00:08

 
  Prepare2
passed #123686
linux
json

00:00:14

passed #123687
linux
json2

00:00:14

 
  Pack
passed #123688
linux
neos

00:00:11

passed #123689
linux
pack

00:00:09

passed #123690
linux
server

00:00:06

 
  Deploy
passed #123694
linux
deploy_to_koishi

00:00:10

passed #123693
linux
deploy_to_tiramisu

00:00:09

passed #123691
linux
upload_neos

00:00:06

passed #123692
linux
upload_version_json

00:00:06