Commit e7eee1ca authored by Benedikt Heinrichs's avatar Benedikt Heinrichs

Merge branch 'Sprint/20190829' into 'master'

Sprint/20190829

See merge request !14
parents f91a1c23 9f20eed6