Merge branch 'master' into 'production'

Merge master into production

See merge request !119
1 job for v1.3.0
in 8 minutes and 15 seconds, using 0 compute credits, and was queued for 1 second