develop into master

Merged Alexandre Morin requested to merge develop into master

Merge request reports