Linking issues on Win — see #4608
Merge pull request #1484 from aappilattoq/master

Linking issues on Win — see #4608