Fix for error report downloads.
Merge branch 'downloadfix' into dev