Merge branch 'patch-7' into 'master'

Fix プレイ・ザ・ディアベル

See merge request !136
10 jobs for master in 1 minute and 53 seconds (queued for 7 seconds)
Status Job ID Name Coverage
  Prepare
passed #141021
linux
merge_databases

00:00:32

 
  Prepare2
passed #141022
linux
json

00:00:12

passed #141023
linux
json2

00:00:30

 
  Pack
passed #141024
linux
neos

00:00:27

passed #141025
linux
pack

00:00:25

passed #141026
linux
server

00:00:19

 
  Deploy
passed #141030
linux
deploy_to_koishi

00:00:22

passed #141029
linux
deploy_to_tiramisu

00:00:14

passed #141027
linux
upload_neos

00:00:07

passed #141028
linux
upload_version_json

00:00:08