Merge branch 'patch-3' into 'master'

Fix

See merge request !128
10 jobs for master in 1 minute and 30 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Prepare
passed #140225
linux
merge_databases

00:00:11

 
  Prepare2
passed #140226
linux
json

00:00:16

passed #140227
linux
json2

00:00:10

 
  Pack
passed #140228
linux
neos

00:00:32

passed #140229
linux
pack

00:00:22

passed #140230
linux
server

00:00:06

 
  Deploy
passed #140234
linux
deploy_to_koishi

00:00:25

passed #140233
linux
deploy_to_tiramisu

00:00:28

passed #140231
linux
upload_neos

00:00:08

passed #140232
linux
upload_version_json

00:00:09