Merge branch 'master' into 'production'

Merge master into production

See merge request !27
1 job for production
in 3 minutes and 30 seconds, using 0 compute credits, and was queued for 8 seconds