merge dev into master

Philipp Dietl requested to merge dev into master

Merge request reports