Merge pull request #2322 from 9rnsr/2.066

Cherry-picking commits from master to 2.066 branch (for beta3)
Merge pull request #2324 from MartinNowak/fix13098

[REG2.066a] Issue 13098 - std.path functions no longer works with DirEntry