Merge branch 'master' into 'production'

Master

See merge request !55
3 jobs for v2.0.0
in 3 minutes and 19 seconds, using 0 compute credits, and was queued for 1 minute and 31 seconds
latest