Merge with master

Alex Watson requested to merge dev into master

Trying again. I think closing it is what stopped it from merging last time

Merge request reports