Master

Merged Andreas Marek requested to merge master into master_pre_stage

Merge request reports