merge changes from master into v2.0

Bring the v2.0 branch up-to-date with the first release.

Merge request reports

Loading