Merge branch 'sprint_delhi' into 'master'

[RELEASE] Sprint delhi

Closes #172 and #171

See merge request !20
1 job for v1.3.1 in 4 minutes and 34 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Build
passed #66316
build

00:04:34