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
Status Job ID Name Coverage
  Build
passed #4451
build

00:01:46

manual #4452
allowed to fail manual
build_shopmason