Master

Merged Matt Wise requested to merge master into remove-snapshot-dependencies

Merge request reports