Master update

Merged Fabian Nuraddin Alexander Gabel requested to merge master-update into master

Merge request reports