1.6

Merged Laurent Montel requested to merge 1.6 into master

Merge request reports