Merge branch 'report_fix' into trunk
Closes #898