Merge branch 'master' into 'master'

Fix 7031&7032

See merge request !96
10 jobs for master in 1 minute and 34 seconds (queued for 5 seconds)
Status Job ID Name Coverage
  Prepare
passed #133606
linux
merge_databases

00:00:18

 
  Prepare2
passed #133607
linux
json

00:00:27

passed #133608
linux
json2

00:00:15

 
  Pack
passed #133609
linux
neos

00:00:24

passed #133610
linux
pack

00:00:14

passed #133611
linux
server

00:00:08

 
  Deploy
passed #133615
linux
deploy_to_koishi

00:00:23

passed #133614
linux
deploy_to_tiramisu

00:00:18

passed #133612
linux
upload_neos

00:00:13

passed #133613
linux
upload_version_json

00:00:07