Merge branch '2.1-dev' into 'master'

2.1 dev

Closes #16, #29, and #14

See merge request !6
2 jobs for v2.1-Midnight-Cherry in 1 minute and 46 seconds (queued for 3 seconds)
latest