Merge branch 'master' into 'production'

Preparing relase 1.1.1

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