Merge pull request #1944 from arnova/streamed_filesystem_speed_fix