Merge branch 'master' into 'production'

Master

See merge request !8
4 jobs for production
in 4 minutes and 32 seconds, using 0 compute credits, and was queued for 2 seconds