Merge pull request #4195 from lateralusX/jlorenss/win-build-dependency