3.1.0 update

Merged Jørgen Lind requested to merge 3.1.0_update into 3.1

Merge request reports