Merge branch 'master' into 'production'

Master

See merge request !28
3 jobs for v1.0.1
in 1 minute and 38 seconds, using 0 compute credits, and was queued for 3 seconds
latest