Bring in updates from Windows-staging.