Merge pull request #1622 from easirois/hotfix/1.8.3
Fix URI generation bugs on Windows #1639