Commit 2cf08b9d authored by spf's avatar spf

Merge branch 'khrys' into 'master'

Khrys

See merge request !24
parents 5dd21759 3619ada0
Pipeline #101749 passed with stages
in 52 seconds