Updating 103-windows-build from master