Merge pull request

#2793
#2794
#2798
#2799
#2800
#2801
#2802
10 jobs for master in 1 minute and 57 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Prepare
passed #152338
linux
merge_databases

00:00:25

 
  Prepare2
passed #152339
linux
json

00:00:28

passed #152340
linux
json2

00:00:36

 
  Pack
passed #152341
linux
neos

00:00:25

passed #152342
linux
pack

00:00:23

passed #152343
linux
server

00:00:07

 
  Deploy
passed #152347
linux
deploy_to_koishi

00:00:26

passed #152346
linux
deploy_to_tiramisu

00:00:18

passed #152344
linux
upload_neos

00:00:14

passed #152345
linux
upload_version_json

00:00:18