Merge branch 'master' into 'production'

Master

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