Merge branch 'ef/win32-dirent' into next