Fix/master

Merged Julien Wadel requested to merge fix/master into master

Merge request reports