Merge pull request #3181 from JosJuice/scrub-directories Don't reserve space for directories when scrubbing
