update contributions from master

Merged Franz Geffke requested to merge master into contributions

Merge request reports