fix XS build on Windows #1433 #1681
Merge pull request #1745 from kelow/master

fix XS build on Windows #1433 #1681