Updating dev

Closed Shane Hutchins requested to merge master into dev

Merge request reports