Merge branch 'patch-6' into 'master'

Fix 目醒める罪宝

See merge request !135
10 jobs for master in 2 minutes and 13 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Prepare
passed #141004
linux
merge_databases

00:00:22

 
  Prepare2
passed #141005
linux
json

00:00:44

passed #141006
linux
json2

00:00:45

 
  Pack
passed #141007
linux
neos

00:00:29

passed #141008
linux
pack

00:00:34

passed #141009
linux
server

00:00:26

 
  Deploy
passed #141013
linux
deploy_to_koishi

00:00:29

passed #141012
linux
deploy_to_tiramisu

00:00:17

passed #141010
linux
upload_neos

00:00:15

passed #141011
linux
upload_version_json

00:00:16