Merge pull request #4663 from xmcclure/bump-linker