Merge branch 'prepare_prod' into 'master'

Prepare prod

See merge request !63
1 job for master in 8 seconds (queued for 3 seconds)