Upstream pull

To fix windows issues.