Merge branch '3.7.1-dev' into 'master'

merge 3.7.1-dev

Closes #2 and #3

See merge request !2
1 job for 4.4.1-dev
in 0 seconds, using 0 compute credits, and was queued for 7 seconds