Merge branch 'master' into 'production'

Preparing release v1.1.1

See merge request !84
3 jobs for production
in 36 seconds, using 0 compute credits, and was queued for 1 second