Merge branch 'master' into 'production'

Master

See merge request !7
3 jobs for v0.0.0
in 3 minutes and 29 seconds, using 0 compute credits, and was queued for 1 minute and 8 seconds