Merge branch '3.5.1-dev' into 'master'

3.5.1 dev

Closes #18, #4, #17, #11, #12, and #5

See merge request !18
3 jobs for v3.5.1
in 32 seconds, using 0 compute credits, and was queued for 4 seconds
latest