Merge branch '3.5.1-dev' into 'master'

3.5.1 dev

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

See merge request !18
1 job for 3.5.1-maintenance in 0 seconds (queued for 10 seconds)
Status Job ID Name Coverage
  External
passed jenkins

00:02:35