Merge branch avigan into master

Arthur Viganrequested to merge
avigan into master

Some minor modifications to test that we can merge branches easily ;)

Merge request reports