Merge branch 'master' into 'production'

Master

See merge request !57
3 jobs for v2.0.2
in 2 minutes and 46 seconds, using 0 compute credits, and was queued for 2 minutes and 18 seconds