Merge branch 'master' into 'production'

Master

See merge request !41
3 jobs for v1.0.2
in 2 minutes and 23 seconds, using 0 compute credits, and was queued for 1 minute and 51 seconds
latest