Merge branch 'master' into 'production'

Master

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