6.8

Merged mattwire requested to merge 6.8 into master

Merge request reports