newest changes (Rebekka and Kristof) into master

Fabian Nuraddin Alexander Gabelrequested to merge
dev into master

Merge request reports