Star Wars Release (Bugfix Version I) 04-05-20

Merged tomalo.stuttgart requested to merge develop into master

Merge request reports