Fixed typo/broken links
Merge pull request #4615 from williamtheaker/upstream

Fixed typo/broken links