Merge branch 'master' into 'production'

Master

See merge request !49
3 jobs for production
in 4 minutes and 6 seconds, using 0 compute credits, and was queued for 43 minutes and 20 seconds