Compatible 4.2

thierryrequested to merge
compatible_4.1 into master

Merge request reports