Commit d03b4bfc authored by Marcel Nellesen's avatar Marcel Nellesen

Merge branch 'Sprint/2020-12' into 'master'

Sprint/2020 12

See merge request !32
parents bc4ed81b 7189171c