Merge branch 'master' into 'production'

Merge 'master' into 'production'

See merge request !100
1 job for v1.2.0
in 7 minutes and 19 seconds, using 0 compute credits, and was queued for 8 minutes
latest