6.1.5

Merged mattwire requested to merge 6.1.5 into master

Merge request reports