Fixed broken links.
Merge pull request #1939 from EricDunsworth/v3.0-broken-link-fixes

Fixed broken links.
Resolved merge conflict.