Merge pull request #7701 from totten/master-getlink