Merge pull request #3761 from kumpera/fix-maccore-linking-regression