Merge Windows-compatible updates into Master.