Merge branch 'master' into 'production'

bug correction

See merge request !58
3 jobs for v2.0.2
in 2 minutes and 44 seconds, using 0 compute credits, and was queued for 3 minutes and 21 seconds