Merge branch 'master' into 'production'

Master

See merge request !50
3 jobs for production
in 3 minutes and 22 seconds, using 0 compute credits, and was queued for 2 minutes and 22 seconds