Fixes conflicts from pull request #338

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

Created by: yngwi

Merge request reports