Fixes an issue with extracting entries that correspond to directories only
Merge branch 'mansyn'