Merge pull request #3426 from ethomson/fs_iterator iterator: loop fs_iterator advance (don't recurse)