Merge branch 'master' into 'production'

solved bug on 2.0.2

See merge request !59
3 jobs for production
in 1 minute and 40 seconds, using 0 compute credits, and was queued for 3 seconds