Merge pull request #4262 from kumpera/fix-windows