Fixed avalanche of broken links.
Merge pull request #2633 from EricDunsworth/v3.1-broken-link-fixes

Fixed avalanche of broken links.