Fix windows non-unicode build
Merge pull request #984 from ricnewton/master

Fix windows non-unicode build