merge master

Merged Bernhard Landauer requested to merge master into rescue

Merge request reports