Add Windows support for new bootstrap
Merge pull request #1909 from jbertram/master

Add Windows support for new bootstrap