Merge branch 'prepare_production' into 'master'

Prepare production

See merge request !15
1 job for master in 23 seconds (queued for 3 seconds)