4.0

Jean-Philippe Metivierrequested to merge
jean-philippe.metivier-master-patch-04631 into master

Merge request reports