Master+release

François-René Rideaurequested to merge
master+release into master

Merge release back into master, to resolve divergence and avoid future issues.

Merge request reports