Merge branch 'v2.2.1-dev' into 'master'

V2.2.1 dev

Closes #35, #37, #34, #36, #33, #39, #30, #32, and #28

See merge request !2
1 job for 3.1.1
in 0 seconds, using 0 compute credits, and was queued for 0 seconds
latest