Merge branch 'master' into 'production'

Master

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