Merge branch 'master' into 'master'

Add ROTA 24/6/11

See merge request !35
10 jobs for master in 54 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Prepare
passed #123574
linux
merge_databases

00:00:08

 
  Prepare2
passed #123575
linux
json

00:00:13

passed #123576
linux
json2

00:00:18

 
  Pack
passed #123577
linux
neos

00:00:11

passed #123578
linux
pack

00:00:11

passed #123579
linux
server

00:00:07

 
  Deploy
passed #123583
linux
deploy_to_koishi

00:00:13

passed #123582
linux
deploy_to_tiramisu

00:00:10

passed #123580
linux
upload_neos

00:00:06

passed #123581
linux
upload_version_json

00:00:13