Merge branch '3.7.1-dev' into 'master'

3.7.1 dev

See merge request !6
1 job for master in 0 seconds (queued for 10 seconds)
latest