Merge pull request #1106 from nico/winfix