merge 1.0 into master

Jørgen Lind requested to merge 1.0 into master

Merge request reports