Merge 'master' branch into 'dev'

Merged Daniel Scheffler requested to merge master into dev

Keep the dev-branch up-to-date.

Merge request reports