Merge pull request #3176 from lateralusX/jlorenss/win-fix-test-dllimport-path