Merge branch 'master' into 'production'

merge master to production

See merge request !142
1 job for v1.4.0
in 36 seconds, using 0 compute credits, and was queued for 2 seconds
latest