Dependency upgrade

Merged David Diederich requested to merge dependency-upgrade into master

Merge request reports