Release 10-04-18

Merged tomalo.stuttgart requested to merge develop into master

Merge request reports