Master

Chris Hinesrequested to merge
master into dev

I stupidly sent last nights MR to master (don't worry there is no production instance yet) rather than dev

Merge request reports