Beta 5

Merged Martin Mechtel requested to merge beta-5 into develop

Merge request reports