Merge branch '22themes/master/lundquism' into 'master'

22themes/master/lundquism

Closes #22

See merge request !12
2 jobs for master in 3 minutes and 14 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #6695
build

00:01:45

 
  Test
passed #6696
unitTests

00:01:28