Merge branch 'master' into 'production'

1.2.1

See merge request !219
1 job for production in 1 minute and 32 seconds (queued for 1 second)
latest