Fixes Windows compatibility issue.
Merges with master.