Master

Merged Marius requested to merge master into stable

Merge request reports