Release 10-04-18

Closed tomalo.stuttgart requested to merge develop into master