Merge branch 'prepare_production' into 'master'

Prepare production

See merge request !64
1 job for master in 12 seconds (queued for 10 seconds)