Merge branch 'master' into 'production'

1.2 production

See merge request !196
1 job for 1.2.0 in 2 minutes and 4 seconds (queued for 1 minute and 42 seconds)
latest