Merge pull request #4654 from wsnipex/linking-fix