Fixes #5342: correct inventories on windows
Merge pull request #458 from ncharles/bug_5342/dev/correct_inventory_windows

Fixes #5342: correct inventories on windows
Merging 2.10 -> 2.11