Merge changes by @StephanMa

Stephanrequested to merge
github/fork/yngwi/master into master

Created by: yngwi

Fixed the Merge conflicts ad merged the changes in pull request #340

Merge request reports