Merge branch 'patch-6' into 'master'

Fix アビスチーム

See merge request !140
10 jobs for master in 1 minute and 29 seconds (queued for 6 seconds)
Status Job ID Name Coverage
  Prepare
passed #141227
linux
merge_databases

00:00:17

 
  Prepare2
passed #141228
linux
json

00:00:15

passed #141229
linux
json2

00:00:25

 
  Pack
passed #141230
linux
neos

00:00:25

passed #141231
linux
pack

00:00:18

passed #141232
linux
server

00:00:12

 
  Deploy
passed #141236
linux
deploy_to_koishi

00:00:19

passed #141235
linux
deploy_to_tiramisu

00:00:20

passed #141233
linux
upload_neos

00:00:07

passed #141234
linux
upload_version_json

00:00:12