Pull windows code into master