Merge proposals

Windows-bugs has no merge proposals.