Merge pull request #708 from arrbee/fix-empty-workdir-iterator Fix workdir iterators on empty directories