Merge branch 'master' into 'production'

Master

See merge request !65
3 jobs for v1.1.0
in 37 seconds, using 0 compute credits, and was queued for 6 seconds