Master

Merged Daniel Wolf requested to merge master into translations

Merge request reports