Upgrade

Merged Chris Hines requested to merge upgrade into master

Merge request reports