Merge branch '3.6.1-dev' into 'master'

3.6.1 dev

Closes #2

See merge request !4
3 jobs for v3.6.1
in 28 seconds, using 0 compute credits, and was queued for 2 seconds
latest