Merge branch 'master' into 'production'

v1.1.11

See merge request !125
3 jobs for v1.1.11
in 36 seconds, using 0 compute credits, and was queued for 1 second
latest