Release/6.0

Closed Benoit Martins requested to merge release/6.0 into master

Merge request reports