Merge branch 'master' into 'production'

Merge 'master' into 'production'

See merge request !73
1 job for production
in 2 minutes and 59 seconds, using 0 compute credits, and was queued for 0 seconds