Merge branch '3.7.1-dev' into 'master'

merge 3.7.1-dev

Closes #2 and #3

See merge request !2
1 job for v3.7.1 in 0 seconds
latest