Merge branch 'master' into 'production'

Master

See merge request !79
3 jobs for v1.0.4
in 0 seconds, using 0 compute credits, and was queued for 0 seconds
latest