Merge branch 'production' into 'master'

Production

See merge request !44
3 jobs for master
in 4 minutes and 7 seconds, using 0 compute credits, and was queued for 1 minute and 46 seconds