Manually merge the conflicts from Pull Request #407

Created by: yngwi

Merge request reports

Loading