merge upstream update

10 jobs for master in 3 minutes and 20 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Prepare
passed #180907
linux
merge_databases

00:02:20

 
  Prepare2
passed #180908
linux
json

00:00:28

passed #180909
linux
json2

00:00:27

 
  Pack
passed #180910
linux
neos

00:00:12

passed #180911
linux
pack

00:00:11

passed #180912
linux
server

00:00:12

 
  Deploy
passed #180916
linux
deploy_to_koishi

00:00:15

passed #180915
linux
deploy_to_tiramisu

00:00:17

passed #180913
linux
upload_neos

00:00:05

passed #180914
linux
upload_version_json

00:00:07