Merge branch 'master' into 'production'

Merge Master into production

See merge request !43
1 job for production
in 36 seconds, using 0 compute credits, and was queued for 2 seconds