Merge pull request #1518 from dg0yt/static-windows