Made load progress report a bit better for big files.
Merge remote-tracking branch 'origin/development' into development