Merge branch 'master' into 'production'

Merge master to production v1.1.1

See merge request !65
2 jobs for v1.1.1
in 6 minutes and 55 seconds, using 0 compute credits, and was queued for 5 minutes and 50 seconds
latest