Merge branch 'prepare_production' into 'master'

Prepare production

See merge request !33
2 jobs for master in 13 seconds (queued for 3 seconds)