Merge pull request #4642 from wsnipex/linking-fix

No match.