Merge branch 'master' into 'production'

Master

See merge request !60
3 jobs for production
in 7 minutes and 31 seconds, using 0 compute credits, and was queued for 4 minutes and 1 second