Merge branch avigan into master

Merged Arthur Vigan requested to merge avigan into master

Fixed some wrong file names.

Merge request reports