Merge branch '3.7.1-dev' into 'master'

3.7.1 dev

See merge request !22
3 jobs for v3.7.1
in 53 seconds, using 0 compute credits, and was queued for 3 minutes and 45 seconds
latest