Bugfix Release 06-11-18

Merged tomalo.stuttgart requested to merge develop into master

Merge request reports