merge master

Merged Bernhard Landauer requested to merge master into ini

Merge request reports